Fix activities

Change-Id: I46c1ef0e56883844276b73778b5fc61eb3b72dd2
Add new theme engine

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	res/xml/preference_headers.xml
	res/xml/theme_settings.xml
	src/com/oct/tentacles/SettingsActivity.java

Change-Id: I8e50f198f79a98e1ecbcd2584f3e3ed6d7fd3f3b
Mo fickz's

Change-Id: I83262b000206b92bf020a2e670d5cd2b402a64dd