testing...
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/persistence/dao/DAOFactory.java