final commit before version 1 release
final final commit with icons and splash for version 1
Merge remote-tracking branch 'Photo-Phun/master'