variable factory
Merge branch 'master' of https://github.com/liorbarak/src

Conflicts:
	testing_bla.java