fix minor bugs
add alias (not work yet)
alias works
add subsite_auth.php
check if something wrong with the commit
fix conflict
Merge branch 'upstream-development' into development