Added app icon & small changes
Merge branch 'master' of https://github.com/iOS-Team-Shujinko/iOS-Teamwork-Mobile-App

Conflicts:
	ItemCatalog2/ItemCatalog2.xcodeproj/project.pbxproj