Pre-revert commit
Merge branch 'master' of https://github.com/ProjectNexus/nexus

Conflicts:
	tmp/cache/assets/CB1/FD0/sprockets%2F6e1bd95023705b5529e7ccc754a02867
	tmp/cache/assets/CDD/450/sprockets%2F8b74664b0e534018a47793ca54d4b5da
	tmp/cache/assets/CFF/E00/sprockets%2F352bab412d75fa19d0a07504553b59df
	tmp/cache/assets/D06/B40/sprockets%2F25fca4643219052b0d5c66cf2c71f72f
	tmp/cache/assets/D49/8D0/sprockets%2F92613a75279536c4bcf4f3ba6cfde494
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D69/C40/sprockets%2Fd2dc36483a865fa84c0f6bf1d23228bb
	tmp/cache/assets/D73/9B0/sprockets%2Ff6eeb33602682bd6ff6d1f177f6b142d
	tmp/cache/assets/D99/730/sprockets%2Fefd3b6bf38c5f0520db1d4e570d8e514
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af