Merge remote-tracking branch 'remotes/origin/master' into mike
beginning asset reorganization
closer to perfect organization
submodule updated
Merge branch 'mike'

Conflicts:
	app/assets/_all.js
	logback-access
re-delete _all.js