Merge branch 'master' of https://github.com/ComputerEngineering/iWish

Conflicts:
	NewFolderForUpload/iWish/AndroidManifest.xml
	NewFolderForUpload/iWish/src/iWish_Activity/TutorialActivity.java