Added ngStorage and Bootstrap modals
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/app.css
	index.html
	js/controllers.js
	js/sortable.js