commit
com
Merge branch 'master' of https://github.com/ithillel/BigBrotherNet.git

Conflicts:
	BigBrotherNet/src/org/hillel/it/bigbrothernet/model/entity/Testing.java