Added icons and more features
Merge branch 'master' of https://github.com/icompuiz/karewebapp

Conflicts:
	app/scripts/exercise/directives/newExerciseForm.js