commit from live
Merge branch 'master' of git://github.com/chiccomask/acapulco-wp
comm