Add/Edit skeleton methods and icons added
Merge branch 'dev' of github.com:rickardz/SchemeApp into dev

Conflicts:
	SchemeApp/SchemeApp.xcodeproj/project.pbxproj