Merge remote-tracking branch 'IWCollege-Android-App/Dev' into Dev

Conflicts:
	IWCollege/src/main/java/com/iwcollege/iwcollege/MainActivity.java
	IWCollege/src/main/res/layout/activity_main.xml