Updated tests

Tests updated to reflect latest changes
Fixed issue #25

Also fixed some naming incoherencies and a few typos.

Conflicts:
	src/js/model/currentUser.js
Merge branch 'newself' of https://github.com/angelovdeodd/firesquare into newself

Conflicts:
	src/js/model/self.js