update latest
Merge branch 'master' of https://github.com/xs9627/angular-seed-start

Conflicts:
	app/app.js
	app/views/navigator.html