Improves the 'parse url' error message.
Merge branch 'develop' into gh-pages

Conflicts:
	js/game_manager.js