Further adjustments for android studio
Merge branch 'master' of github.com:Stocard/FloatingActionButton

Conflicts:
	FloatingActionButton/AndroidManifest.xml