citation processing and interface in active admin
Merge branch 'citation' into develop

Conflicts:
	Gemfile