added validation
Merge branch 'master' of https://github.com/kamenkurtev/testapp

Conflicts:
	public/app/js/controllers/ContactController.js