Hugo Soucy 59f846835e Merge branch 'master' of github.com:titilambert/adagios-frontend into frontend_fev13
Conflicts:
	app/components/sidebar/sidebar.html
	app/components/sidebar/sidebar.js
	app/components/tactical/tactical.html
	app/dashboard/dashboard.html
	app/dashboard/dashboard.js
2015-03-17 14:59:07 -04:00
..
2015-02-18 10:59:23 -05:00