rapidftr/tracker#52 @austiine @mwangiann bundling apk within docker contain [skip ci]
Merge branch 'master' of github.com:austiine04/RapidFTR
@austiine04 button for adding standard forms
rapidftr/tracker#48 @austiine removes child form_section seeds to enable custom form section selection
WIP
Updated infrastructure, increased self-signed SSL expiry time [skip ci]
@ctumwebaze rapidftr/tracker#53 fixes backward compatibility for form sections.

This fix supports the backward compatibility of the 1.2.1 apk. The compatibility was broken due to missing call to
formatted_hash to format the localized properties of the form section i.e display name.
rapidftr/tracker#48 @andreweskeclarke @austiine Adding page and controller logic to add standard form sections to current forms
rapidftr/tracker#48 @andreweskeclarke @austiine04 selecting standard forms
rapidftr/tracker#48 @andreweskeclarke @austiine04 Marking saved standard forms and formsections as disabled for future use in the UI
rapidftr/tracker#52  @austiine @andreweskeclarke reloading sections on a form
rapidftr/tracker#52  @austiine @andreweskeclarke implementing standard forms service
rapidftr/tracker#48 @andreweskeclarke @austiine04 Adding
StandardFormsService to save the standard forms data from the UI.
rapidftr/tracker#48 @andreweskeclarke @austiine04 Cleaning up the UI
rapidftr/tracker#48 @andreweskeclarke @austiine04 Adding cucumber features to cover standard forms page
rapidftr/tracker#48 @andreweskeclarke @austiine04 Removing jquery library and replacing with custom js to handle standard form checkbox nesting, did not suit our needs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Dockerfile
rapidftr/tracker#48 @andreweskeclarke @mwangiann Fixing rubocop failures in the code
@ctumwebaze @austiine04 rapidftr/tracker#52 bunding apk with server

This fix ensures that the apk is downloaded using http rather than https. This is because
if the server is using a self-signed certificate, the android device will not trust the certificate and
will go into an indefinate download loop.

This fix ensure that if a request for an apk comes in over https, it will be redirected to http.
Merge pull request #692 from ctumwebaze/master

 Bundling apk with server