Revert "Initial cleanup"

This reverts commit 60103e33e838535017ed89b4c0d73d5871687b2c.
Initial cleanup

Conflicts:
	AndroidManifest.xml
	res/layout-finger/order_power_widget_buttons_activity.xml
	res/xml/interface_settings.xml
	res/xml/lock_screen_general.xml
	res/xml/navbar_settings.xml
	res/xml/power_widget_settings.xml
	res/xml/preference_headers.xml
	res/xml/status_bar.xml