Merge pull request #263 from PonteIneptique/new_guides

New guides fix + DB
Merge pull request #264 from PonteIneptique/new_guides

Space
Merge branch 'master' into merge_guides

Conflicts:
	project/Build.scala
Merge branch 'master' into merge_guides
Merge branch 'master' into merge_module_refactor_into_merge_guides

Conflicts:
	modules/users/app/views/userProfile/edit.scala.html
	project/Build.scala
Cleanup of guides controllers and various i18n changes
Make guides DB structure more H2-friendly
Merge branch 'master' into merge_guides
Start with adding some guides tests
More work on guides.
 - Add more tests
 - Fix some finger-trouble bugs I added in prev commits
 - Convert multi-value fields to Enums
More guide refactoring.
 - Make delete actions POST
 - Add integration tests for admin view actions
 - Rename some DB columns so they match data/form fields
 - Remove bind of PKs from hidden form fields
 - Make routes require a user
 - Various other cleanups
Merge branch 'master' into merge_guides
Fix missed de-stringification of menu config and missed compilation issue.
Another missed de-stringification
Merge branch 'master' into merge_guides
Merge branch 'master' into merge_guides

Conflicts:
	modules/users/app/views/userProfile/edit.scala.html
Merge branch 'master' into merge_guides
Merge with merge guides