Merge branch to include Edit Text Updates
Merge branch 'master' of https://github.com/Bearded-Hen/Android-Bootstrap

Conflicts:
	AndroidBootstrap/res/layout/bootstrap_edit_text.xml
	AndroidBootstrapTest/res/layout/activity_main.xml

AndroidBootstrapTest/src/com/beardedhen/androidbootstraptest/MainActivit
y.java
	README.md