MInor Changes
Merge branch 'master' of https://github.com/ProjectNexus/nexus

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
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/pids/server.pid