Merge pull request #3 from ZolnaiDani/master

Added navigation drawer compatibility
Updated support library
Merge remote-tracking branch 'upstream/master'

Conflicts:
	library/libs/android-support-v4.jar