Just a comment!
allow for subdirs in urls
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	chronicle-app/app/scripts/app.js
added guice support and refectoring handler to controller
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
cleanup