Tweaks
Merge branch 'testing' of https://github.com/ProjectNexus/nexus into testing

Conflicts:
	log/development.log
	tmp/cache/assets/CB1/FD0/sprockets%2F6e1bd95023705b5529e7ccc754a02867
	tmp/cache/assets/CFF/E00/sprockets%2F352bab412d75fa19d0a07504553b59df
	tmp/cache/assets/D49/8D0/sprockets%2F92613a75279536c4bcf4f3ba6cfde494
Merge branch 'testing' of https://github.com/ProjectNexus/nexus into testing

Conflicts:
	log/development.log
	tmp/cache/assets/CB1/FD0/sprockets%2F6e1bd95023705b5529e7ccc754a02867
	tmp/cache/assets/CFF/E00/sprockets%2F352bab412d75fa19d0a07504553b59df
	tmp/cache/assets/D49/8D0/sprockets%2F92613a75279536c4bcf4f3ba6cfde494
Changes