Added some new bugs
Merge branch 'master' of https://github.com/ohthanks/pwp-orderpads

Conflicts:
	app/views/indexView.js