clean up
Merge branch 'master' of github.com:Sellegit/AndroidFloatLabel

Conflicts:
	.gitignore