updated to use ui-router instead of ng-route
updated tests and changed all routeparams to stateparams
new nodemon version

update package.json to include new grunt-nodemon 0.2.0 version
Merge branch 'master' of https://github.com/elmalto/mean into elmalto-master

Conflicts:
	test/karma/karma.conf.js
fixed jshints indentations warnings
Merge pull request #278 from ciccio86/master

new nodemon version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bower.json
	public/js/app.js
	public/js/config.js