Merge branch 'develop' of github.com:acres4/acres4 into develop


Former-commit-id: 3010e47b158f6685c0760795aa9d3daf7726ab83
info.plist added


Former-commit-id: a1c6af745f2c56faf52de1d32a66da06d50ebeb0
Stupid commit to get the version.plist parsed


Former-commit-id: 71173ce47bd25bc0874ad888ce245f597158ffdd
LadiesChoice - fixed version script issue


Former-commit-id: af916caec66050f4767a01a3adc7a266b40eb68b
Merge branch 'develop' of github.com:acres4/acres4 into develop


Former-commit-id: 0ee3f27c14afe458a08ff85a182ba7933a2c1735
LadiesChoice - fixed path error in previous commit


Former-commit-id: d5245d60eba1cd6098f6a0927b77cdcfc0b613a0
@autobuild{ladieschoice} Testing Ladies Choice build settings


Former-commit-id: 8e78b39ef96ca0f3a45c993c3e115241bdea4d9c
Fixed issue with break busy report dates not working


Former-commit-id: 6d09fcd05f8999dff60d75fcf27834fb79c1a726
Frontline - fixed upside down location picker and meal reason picker if device was held home button up


Former-commit-id: 5520d0bcb6c40c8ca60b7381457e0603a757f739
Merge branch 'develop' of https://github.com/acres4/acres4 into develop

Conflicts:
	scripts/throwaway.txt

Former-commit-id: 495db8335068c64b7b26acf4795b0c6a4261c208
Merge branch 'hotfix/chuck' of https://github.com/acres4/acres4 into hotfix/chuck


Former-commit-id: 40c17b3f64e5401e98844f53b91d0c1a9393b66b
@autobuild{supervisor frontline mercury-offline} Fixed issue with the data selector showing the wrong dates


Former-commit-id: 91a43c86454b69a48f83fc8d729938a250dac470
Bluetooth - fixed an issue that may have caused a duplicate listing of a recently connected bluetooth device


Former-commit-id: 5c4fada894f935a9d58a272149c19d20bc1210f8
Merge branch 'hotfix/chuck' into develop

Conflicts:
	scripts/throwaway.txt

Former-commit-id: a2e208de6de04383c931144a993a62cc311183c5
Added choice on logout, so close session or not.  Added shift report display when closing session.


Former-commit-id: a83adccdcd9a3abf149da052dca7176466bd9e87
Changed subheadings on the busy/break report to work like all other reports.


Former-commit-id: 063520cb92caff112815979fdd8a92be42360849
Merge branch 'hotfix/chuck' into develop


Former-commit-id: 6b11787c5a351826e34840a89f298a04af4e0f78
Fixed an issue that caused a file to be compiled with ARC for one architecture and without ARC for another


Former-commit-id: 8c6f2d5cbf571acf387cc2971900f140fedff521
Merge branch 'hotfix/chuck' into develop


Former-commit-id: 1023a923e855c07a57ed46a2d83e32dc6e055dc4
Fix for the report table misaligning cells


Former-commit-id: 9332146f5827d5228c5942b442079dbf1ba4441c