fix advent notify mailer
remove alliance duplicate button
add a hidden field to user signup to try and prevent bots joining
Merge branch 'develop'
fix in pogsteam copy to local
Merge branch 'develop'
add priority to trophies
add priority to trophies
add gui for promoting and demoting trophies in cabinet
Merge branch 'trophy_upgrade'
add gui for promoting and demoting trophies in cabinet
mailer name test
mailer name test
remove old boinc_model file
added a couple of new views to the trophy page
added a couple of new views to the trophy page
add pop up to new trophy view
force ssl for /users* and /admin*