Added gallery feature
Merge branch 'master' of https://github.com/ITS-UofIowa/now.uiowa.edu

Conflicts:
	modules/features/feature_entity/feature_entity.strongarm.inc