t
Merge branch 'master' of https://github.com/farmers/Android-Bootstrap

Conflicts:
	AndroidBootstrap/src/com/beardedhen/androidbootstrap/BootstrapButton.java