Fix for checkbox padding on platforms where checkbox padding is included in the widget.
Entire progress bar fix in one commit
Merge pull request #34 from dimagi/progress-bar-fix-copy

Entire progress bar fix in one commit
Merge branch 'commcare_2.15' into cc_215_merge

Conflicts:
	src/org/odk/collect/android/activities/FormEntryActivity.java
	src/org/odk/collect/android/logic/FormController.java
Merge pull request #38 from dimagi/cc_215_merge

Cc 215 merge