Merge pull request #53 from AshFurrow/switch-view

@1aurabrown => Switch View
Merge pull request #63 from AshFurrow/mainscreen-contents

@orta => Mainscreen contents
support deploying from orta's computer
Merge remote-tracking branch 'upstream/master' into RAC2
merge changes
Merge pull request #64 from orta/RAC2

@ashfurrow => support deploying from orta's computer
distribution changes to fix #10 - and use card reader on card fulfilment vc
Merge pull request #65 from orta/RAC2

@ash distribution changes to fix #10 - and use card reader on card fulfilmentVC
Changes to constants.