fix content layout
Merge branch 'master' of https://github.com/gtor67/coach

Conflicts:
	bin/classes.dex
	bin/classes/com/example/coachme/LoginActivity$1.class
	bin/classes/com/example/coachme/LoginActivity.class
	bin/classes/com/example/coachme/TrainingFilterActivity.class
	bin/coachme.apk
	bin/resources.ap_
fix conetedt
fix content layout