pusha
Merge branch 'master' of https://github.com/lestarcdog/GetLucky.git

Conflicts:
	GetLuckyEJB/ejbModule/pt/feup/lapd/getlucky/dao/CommunityDAO.java
	GetLuckyEJB/ejbModule/pt/feup/lapd/getlucky/dao/EventDAO.java
	GetLuckyEJB/ejbModule/pt/feup/lapd/getlucky/dao/PersonDAO.java