Glyphicon på alle tre knapper -Tanja
Standart commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/OrderHistory.json
	views/index.jade
Standart commit