Latest changes for bar app
Merge branch 'master' of ssh://stash.devgravy.co.uk:7999/boa/web-portal

* 'master' of ssh://stash.devgravy.co.uk:7999/boa/web-portal:
  Version 2

Conflicts:
	source/app/models/model.php
	source/app/views/header.php
	source/app/views/web/view.php
Merge branch 'master' of https://github.com/smgdesign/Bar-Order

# By smgdesign
# Via smgdesign
* 'master' of https://github.com/smgdesign/Bar-Order:
  Create README.md