icon update and API updates
Merge branch 'master' of github.com:YCAMInterlab/Duration

Conflicts:
	Duration/Duration.xcodeproj/project.pbxproj