no message
Merge branch 'branchGUI_SlidingMenu' of https://github.com/DusanTrkulja/sw14_xp_02 into branchGUI_SlidingMenu

Conflicts:
	project/res/layout/activity_login.xml
Initial commit
Merge branch 'master' of https://github.com/DusanTrkulja/sw14_xp_02 into branchGUI_SlidingMenu

Conflicts:
	InstaChatX/libs/android-support-v4.jar
	project/AndroidManifest.xml
	project/libs/SlidingMenu-master/library/libs/android-support-v4.jar
	project/libs/android-support-v4.jar
	project/res/layout/activity_login.xml
	project/src/com/github/sw14_xp_02/LoginActivity.java
Merge branch 'branchGUI_SlidingMenu' of https://github.com/DusanTrkulja/sw14_xp_02 into branchGUI_SlidingMenu

Conflicts:
	InstaChatX/res/values/strings.xml
	InstaChatX/res/values/styles.xml
	project/res/layout/activity_login.xml