Comments
Merge branch 'master' into Hugo

Conflicts:
	src/com/ninemensmorris/MainActivity.java