last push
addactivity_v2.php
addactivity_v2.php, formatting
Merge branch 'master' of https://github.com/projectx411/projectx
fix bugs