Various small fixes
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	AMSpringboard/AMSpringboardDataProvider.m
	AMSpringboard/AMSpringboardViewCell.m
merge fixes
Merge remote-tracking branch 'mindsnacks/develop' into develop

Conflicts:
	AMSpringboard.xcodeproj/project.pbxproj