Color changes and sorter
Merge branch 'master' of https://github.com/meepzh/task-your-friends

Conflicts:
	app/app.iml