david-27/12/2014 changes

- Contact Us tab on the side bar* - display locations and contact info
(new location later Anil will tell)
- added Promotions tab no side menu
- added icons to footer
- "cancel" classes (not "delete")
- attendance taking: the barcode generator service works (one person per
barcode which is linked to the user ID (inside app already now just need
the real barcode)
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/index.html