Merge branch 'trello-34-homepage' into dryad-dev
Merge branch 'dryad-dev' of github.com:datadryad/dryad-repo into dryad-dev
Merge branch 'journal-config' into dryad-dev

Conflicts:
	dspace/config/DryadJournalSubmission.testing.properties
Merge branch 'journal-config' into dryad-dev

Conflicts:
	dspace/config/DryadJournalSubmission.testing.properties
Merge branch 'trello-34-mailinglist' into dryad-dev
Merge branch 'journal-config' into dryad-dev
Modifications to journal table (bad data, removed extra headers and some comments)
Add email template for Membership application
Add Aspects for membership form
Form handling for membership
Add membership recipient to dspace.cfg
Try renaming revenue field names

Mail formatting isn't working
Merge remote-tracking branch 'datadryad/dryad-dev' into atmire-1446
Remove lone single quote in email template

This was causing the rest of the variables not to be substituted
Revert "Try renaming revenue field names"

This reverts commit 791a549d5b913658badef5569b38ff16156a2a97.
This didn't fix the issue and the original names were easier to read
Correct wrong text in rep_name.label2
Update markup for comments field
Handle org_type_other in form and email
new theme development : data package templates, new menu and navigation
Merge remote-tracking branch 'origin/atmire-1446' into dryad-staging