Merge pull request #2 from sherwyngoh/master

Merge pull request #1 from sherwyngoh/feature/packing-list
Added more stuff
Merge branch 'feature/packing-list' of https://github.com/sherwyngoh/partysweet into feature/packing-list
Merge pull request #3 from sherwyngoh/feature/packing-list

Feature/packing list
merge
Merge branch 'master' into feature/create

Conflicts:
	www/js/controllers.js