Updating to Holo theme and using new url for website
Merged Cahnges
Fixing more merges
command line merge fix