asdsadsad
asd
Merge branch 'master' of https://github.com/galtomer/mn.git

Conflicts:
	MyNeighborsProject/src/com/myneighbors/dbhandlers/DBConnection.java
	MyNeighborsProject/src/com/myneighbors/servlets/MNServletContextListner.java