New UI Commit + Twitter Integration
Merge remote-tracking branch 'origin/new-ui' into new-ui

Conflicts:
	src/res/layout/activity_signin.xml