Twitter integrated
Merge branch 'master' of https://github.com/Busuu/T1000App

* 'master' of https://github.com/Busuu/T1000App:
  Adapting to new navigation
  basic navigation
  internet permission

Conflicts:
	res/layout/activity_main.xml
	src/com/busuu/t1000/ui/TwitterActivity.java
lio
Merge branch 'master' of https://github.com/Busuu/T1000App

* 'master' of https://github.com/Busuu/T1000App:
  Word of the day

Conflicts:
	res/layout/activity_main.xml