pages login, join, admin - annotation based
Merge remote-tracking branch 'origin/master'