ActorDAOImpl updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	douge/src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/javagurulv/javaguru_java2_2014_TeamDougeProject
ActorDAOImpl updated