Merge branch 'release/2014-final' into develop
Merge branch 'hotfix/fix_user_order_redirection_error' into develop
update sync script
add badge name to list of fields displayed
Merge branch 'feature/find_badges' into develop
only display the option sets connected to a type of merch
upgrade to newest MortisCMS with not-found content fixes
Better title handling
set title for store
No store
Make sure store works in admin mode.
2014 not 2013 for tickets
Merge branch 'release/2014-final-no-really'