initial commit
removed ACTV stuff
cleanup
cleanup
Merge remote branch 'origin/master'