testing object added
testing object deleted
added about view and actionbar btn
moved view styles into style.xml
Huge merge and related fixes.