contrib link update
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update README.md
Update README.md
Merge branch 'develop'
fix hardcoded language string
Merge branch 'master' into develop
don't show character pulldown when no guildmembers
Merge branch 'develop'
ucp now sets game by itself from guild
Merge branch 'develop'
update instructions for last commit
Merge branch 'master' into develop
align acp with ucp, but leave the game pulldown

so you can override guild game if you wish, but this is not recommended.
Merge branch 'develop'
Merge branch 'master' into develop
fix ajax issue un ucp
fix blockfactory path