commit before pull.
Merge branch 'master' of https://github.com/proxi24be/proxi24be

Conflicts:
	protected/tests/unit/FormManagerTest.php
removing deprecated file + creating new file