New branch to cleanup (and hack :-P) drawer's code
FIX drawer content offset
Merge cleanup in drawer's code

Conflicts:
	AndroidManifest.xml