Merge branch 'master' into level-json

Conflicts:
	SpaceEscape/src/edu/purdue/cs/spaceescape/GameBoardActivity.java
Merge branch 'level-json' of github.com:Purdue-ACM-SIGAPP/space-escape into level-json

Conflicts:
	SpaceEscape/src/edu/purdue/cs/spaceescape/GameBoardActivity.java