color
Merge branch 'master' of https://github.com/trd-isaac/listviewTest

Conflicts:
	Resources/app.js