sorintest
Merge branch 'master' of ssh://github.com/alexGrigorescu/pradmin

Conflicts:
	application/configs/local.ini