sorting
Merge commit '0f98e41262c5ee5e7476d684813ba5b3a18d493c'

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/CtrlMain.js
	app/views/partials/list.html
Merge branch 'master' into dragNdrop

* master:
  sorting

Conflicts:
	app/scripts/controllers/CtrlMain.js
	app/views/index.html
	app/views/partials/list.html