Add Karma unit tests
Merge branch 'pr/126'

Conflicts:
	package.json
Testing Fix
Testing Fix
Removed the Show User method
Merge with mean master