Merge branch 'drzb2013v2' of mjesec.ffzg.hr:/git/angular-drzb into drzb2013v2

diff --cc angular-server.pl
Simple merge

diff --cc app/index.html
index c81b828,b24bf86..4fa2ef1
--- 1/app/index.html
--- 2/app/index.html
+++ b/app/index.html
@@@ -5,11 -5,10 +5,11 @@@
    <title>DRZB conference</title>
  
    <!-- Twtitter bootstrap -->
-   <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
-   <link rel="stylesheet" href="bootstrap/css/bootstrap-responsive.min.css" />
+   <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
+   <link rel="stylesheet" href="lib/bootstrap/css/bootstrap-responsive.min.css" />
  
    <link rel="stylesheet" href="css/app.css"/>
 +  <link rel="stylesheet" href="css/drzb2013.css"/>
  
      <!--[if lte IE 8]>
        <script>