Merge branch 'develop' of https://github.com/kubasub/chinese-checkers into feature/Networking

Conflicts:
	android-application/ChineseCheckers/src/main/java/ca/brocku/chinesecheckers/OnlineListActivity.java
Stuff
Merge branch 'develop' of https://github.com/kubasub/chinese-checkers into feature/Networking