Commit: Minor Changes in Gen Info
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/co/nextix/jardine/activities/add/fragments/AddActivityPhotosAndAttachments.java
Merge remote-tracking branch 'origin/master'