Revert "Fixed issue #25"

This reverts commit 47e7f291cc64332891f94640fa4ea30c6326eab9.
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 pull request #2 from angelovdeodd/unstable

Merge all changes