added angularjs :-)
Merge remote-tracking branch 'origin/master'

Conflicts:
	util/ConfigDAO.php
	util/ProxyUser.php
test dir added.