Preliminary work, journal model
Merge branch 'master' of github.com:ccstevenson/goal-application

Conflicts:
	frontend/app/app.js
	frontend/app/view2/view2.js
	frontend/bower.json