stuffs
Merge branch 'master' of https://github.com/dominiclind/meals

Conflicts:
	app/js/directives/d-edge-swipe.js

platforms/ios/Meals.xcodeproj/project.xcworkspace/xcuserdata/dominiclind
.xcuserdatad/UserInterfaceState.xcuserstate
conflict fix