2nd Commit

I change the whole code and I use sherlock to use navigation drawer +
swipeable tab view
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml