No clue what this is
Merge branch 'master' into developmental

Conflicts:
	js/main.js
Merge pull request #1 from p16774/developmental

Developmental