Prepare for release
Merge remote-tracking branch 'origin/demo' into demo

Conflicts:
	app/index.html
	bower.json
	dist/bower_components/angular-mocks/.bower.json
	dist/bower_components/angular-mocks/angular-mocks.js
	dist/bower_components/angular-mocks/bower.json
	dist/bower_components/angular-resource/.bower.json
	dist/bower_components/angular-resource/angular-resource.js
	dist/bower_components/angular-resource/angular-resource.min.js
	dist/bower_components/angular-resource/angular-resource.min.js.map
	dist/bower_components/angular-resource/bower.json
	dist/bower_components/angular-route/.bower.json
	dist/bower_components/angular-route/angular-route.js
	dist/bower_components/angular-route/angular-route.min.js
	dist/bower_components/angular-route/angular-route.min.js.map
	dist/bower_components/angular-route/bower.json
	dist/bower_components/angular-scenario/.bower.json
	dist/bower_components/angular-scenario/angular-scenario.js
	dist/bower_components/angular-scenario/bower.json
	dist/bower_components/angular/.bower.json
	dist/bower_components/angular/angular-csp.css
	dist/bower_components/angular/angular.js
	dist/bower_components/angular/angular.min.js
	dist/bower_components/angular/angular.min.js.gzip
	dist/bower_components/angular/angular.min.js.map
	dist/bower_components/angular/bower.json
	dist/bower_components/bootstrap/.bower.json
	dist/bower_components/bootstrap/LICENSE
	dist/bower_components/bootstrap/README.md
	dist/bower_components/bootstrap/bower.json
	dist/bower_components/bootstrap/dist/css/bootstrap-theme.css
	dist/bower_components/bootstrap/dist/css/bootstrap-theme.min.css
	dist/bower_components/bootstrap/dist/css/bootstrap.css
	dist/bower_components/bootstrap/dist/css/bootstrap.min.css
	dist/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
	dist/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
	dist/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
	dist/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
	dist/bower_components/bootstrap/dist/js/bootstrap.js
	dist/bower_components/bootstrap/dist/js/bootstrap.min.js
	dist/bower_components/bootstrap/js/affix.js
	dist/bower_components/bootstrap/js/alert.js
	dist/bower_components/bootstrap/js/button.js
	dist/bower_components/bootstrap/js/carousel.js
	dist/bower_components/bootstrap/js/collapse.js
	dist/bower_components/bootstrap/js/dropdown.js
	dist/bower_components/bootstrap/js/modal.js
	dist/bower_components/bootstrap/js/popover.js
	dist/bower_components/bootstrap/js/scrollspy.js
	dist/bower_components/bootstrap/js/tab.js
	dist/bower_components/bootstrap/js/tooltip.js
	dist/bower_components/bootstrap/js/transition.js
	dist/bower_components/bootstrap/less/badges.less
	dist/bower_components/bootstrap/less/breadcrumbs.less
	dist/bower_components/bootstrap/less/button-groups.less
	dist/bower_components/bootstrap/less/buttons.less
	dist/bower_components/bootstrap/less/carousel.less
	dist/bower_components/bootstrap/less/code.less
	dist/bower_components/bootstrap/less/dropdowns.less
	dist/bower_components/bootstrap/less/forms.less
	dist/bower_components/bootstrap/less/glyphicons.less
	dist/bower_components/bootstrap/less/grid.less
	dist/bower_components/bootstrap/less/input-groups.less
	dist/bower_components/bootstrap/less/jumbotron.less
	dist/bower_components/bootstrap/less/list-group.less
	dist/bower_components/bootstrap/less/mixins.less
	dist/bower_components/bootstrap/less/modals.less
	dist/bower_components/bootstrap/less/navbar.less
	dist/bower_components/bootstrap/less/navs.less
	dist/bower_components/bootstrap/less/normalize.less
	dist/bower_components/bootstrap/less/pager.less
	dist/bower_components/bootstrap/less/pagination.less
	dist/bower_components/bootstrap/less/panels.less
	dist/bower_components/bootstrap/less/popovers.less
	dist/bower_components/bootstrap/less/print.less
	dist/bower_components/bootstrap/less/responsive-utilities.less
	dist/bower_components/bootstrap/less/scaffolding.less
	dist/bower_components/bootstrap/less/tables.less
	dist/bower_components/bootstrap/less/theme.less
	dist/bower_components/bootstrap/less/thumbnails.less
	dist/bower_components/bootstrap/less/tooltip.less
	dist/bower_components/bootstrap/less/type.less
	dist/bower_components/bootstrap/less/variables.less
	dist/bower_components/bootstrap/less/wells.less
	dist/bower_components/es5-shim/.bower.json
	dist/bower_components/font-awesome/.bower.json
	dist/bower_components/jquery-color/.bower.json
	dist/bower_components/jquery.smooth-scroll/.bower.json
	dist/bower_components/jquery/.bower.json
	dist/bower_components/jquery/.gitignore
	dist/bower_components/jquery/README.md
	dist/bower_components/jquery/package.json
	dist/bower_components/ladda/LICENSE
	dist/bower_components/underscore/.bower.json
	dist/index.html
	dist/views/main.html
Prepare for firts release