IOS7 inforview2
Merge branch 'master' of https://github.com/ribes03/AlphaPhotoNote

Conflicts:
	.DS_Store