Commit
Merge branch 'master' of https://github.com/koonchaim/proj2014_013

Conflicts:
	src/com/project/utility/ConnectDB.java