Merge branch 'develop' into tylersBranch

Conflicts:
	thors-code.js - Removed from repo