Minor updates
Refactoring
Merge branch 'refs/heads/dev'

* refs/heads/dev:
  Refactoring
  Minor updates

Conflicts:
	app/js/views/app.coffee