Andrew "Added separate buttons for customer view"
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject into dev