Merge remote-tracking branch 'origin/database' into unstable

Conflicts:
	AndroidManifest.xml
	src/com/overthink/thembtaapp/ui/MainActivity.java
Example stub for preferencs activity
Merge remote-tracking branch 'origin/database' into unstable
Implemented a settings activity
Fixed route retrieval bug
Merge remote-tracking branch 'origin/preferences' into unstable

Conflicts:
	src/com/overthink/thembtaapp/database/FavoritesOpenHelper.java
Merge remote-tracking branch 'origin/unstable' into unstable

Conflicts:
	AndroidManifest.xml
	src/com/overthink/thembtaapp/ui/HomeFragment.java
	src/com/overthink/thembtaapp/ui/MainActivity.java
Merge remote-tracking branch 'origin/unstable' into unstable

Conflicts:
	src/com/overthink/thembtaapp/ui/HomeFragment.java
	src/com/overthink/thembtaapp/ui/MainActivity.java
Merge remote-tracking branch 'origin/unstable' into unstable

Conflicts:
	AndroidManifest.xml
	res/menu/alerts.xml
Merge remote-tracking branch 'origin/unstable' into unstable

Conflicts:
	AndroidManifest.xml
Cleaned up code