Merge branch 'master' of github.com:mwaylabs/The-M-Project-Sample-Apps

Conflicts:
	kitchensink/app/scripts/controllers/split.js
Merge branch 'master' of github.com:mwaylabs/The-M-Project-Sample-Apps