add amd, ui router
save
save
save
save
refine
remove project
Merge branch 'master' into preparemerge

Conflicts:
	Gruntfile.js
	app/js/routes/routes.js
	app/project.json
	app/views/root.html
	package.json
	tasks/template.js
	tasks/usemin-prepare.js
	tasks/usemin.js
grunt default task
add bower install
save
rc1
bump version