Update karma conf
Merge branch 'master' into socketio
Add mock for socket service so tests work
rename main spec
Update header
Rename main spec
Merge branch 'master' into socketio

Conflicts:
	client/app/main/main.html