undo skip when next is pressed
Merge branch 'release-v1.1' of https://github.com/mnipper/AndroidSurvey into release-v1.1
Fix merge conflict

Merge branch 'release-v1.3' of https://github.com/mnipper/AndroidSurvey

Conflicts:
	src/org/adaptlab/chpir/android/survey/QuestionFragment.java
	src/org/adaptlab/chpir/android/survey/SurveyFragment.java

Remove undoSkip and questionIsSkipped.  Is no longer being used now that we have added other special responses.
Do not replace https with http when pinging server
Api is available on http status code 426

The api is available if a status code of 426 is returned.  An upgrade of the application is required.  Let the version acceptable method handle the error message in this case.
Merge branch 'master' of https://github.com/mnipper/AndroidSurvey into release-v1.3