Merge branch 'develop' of github.com:acres4/acres4 into develop
info.plist added
Stupid commit to get the version.plist parsed
LadiesChoice - fixed version script issue
Merge branch 'develop' of github.com:acres4/acres4 into develop
LadiesChoice - fixed path error in previous commit
@autobuild{ladieschoice} Testing Ladies Choice build settings
Fixed issue with break busy report dates not working
Frontline - fixed upside down location picker and meal reason picker if device was held home button up
Merge branch 'develop' of https://github.com/acres4/acres4 into develop

Conflicts:
	scripts/throwaway.txt
Merge branch 'hotfix/chuck' of https://github.com/acres4/acres4 into hotfix/chuck
@autobuild{supervisor frontline mercury-offline} Fixed issue with the data selector showing the wrong dates
Bluetooth - fixed an issue that may have caused a duplicate listing of a recently connected bluetooth device
Merge branch 'hotfix/chuck' into develop

Conflicts:
	scripts/throwaway.txt
Added choice on logout, so close session or not.  Added shift report display when closing session.
Changed subheadings on the busy/break report to work like all other reports.
Merge branch 'hotfix/chuck' into develop
Fixed an issue that caused a file to be compiled with ARC for one architecture and without ARC for another
Merge branch 'hotfix/chuck' into develop
Fix for the report table misaligning cells