add color picker to ng-model for inputs
update json
Merge branch 'master' of https://github.com/ionlyseespots/simple

Conflicts:
	README.md