ugh...
implemented the rules activity and rotation on GetPhotoActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
implemented the rules activity and rotation on GetPhotoActivity