system update and fixes
site update and fixes
resolved conflict
Update waAppConfig.class.php
Merge branch 'virgin' into develop