Updated tests

Tests updated to reflect latest changes
Merge branch 'unstable' of https://github.com/PJZL/firesquare into PJZL-unstable

Conflicts:
	src/js/model/self.js
Merge remote-tracking branch 'upstream/unstable' into unstable

Conflicts:
	tests/model/currentUser.js
Fixed issue #25

Also fixed some naming incoherencies and a few typos.

Conflicts:
	src/js/model/currentUser.js
	src/js/view/drawer.js
	src/js/view/login.js
Fixed some errors and updated with upstream
Merge pull request #29 from angelovdeodd/unstable

Changed module name "self" to "currentUser" PJZL/firesquare#29
Merge remote-tracking branch 'origin/unstable' into improvements

Conflicts:
	src/js/view/drawer.js
Merge remote-tracking branch 'origin/improvements' into gps