Cleaned up some code and made the navigation drawer items orange
Merge branch 'orangeGUI'

Conflicts:
	tsap/src/org/tribler/tsap/MainActivity.java