Icon updates and more
Merge branch 'master' of https://github.com/HackLightly/HeyJarvis

Conflicts:
	HeyJarvis.xcodeproj/project.pbxproj