This is tested and should be working.
create user on cyber coach
solve cybercoach user deletion
Merge remote-tracking branch 'origin/users_cybercoach_new' into dev

Conflicts:
	Gemfile
Merge branch 'dev' of github.com:ASE-2014/spoodle into dev