Bring model back from Zeprj project.
Refactoring code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/services/data.js.coffee
Bring model back from Zeprj project.
Refactoring code.