Merge branch 'hotfix-0.1.1' into develop
Merge branch 'hotfix-0.1.2' into develop
citation processing and interface in active admin
Merge branch 'citation' into develop

Conflicts:
	Gemfile
Merge branch 'release-0.2' into staging