Merge branch 'master' of https://github.com/antoniodan1/ChampionsNetwork

Conflicts:

	Champions-common-impl/src/main/java/org/amazed/champions/common/dao/GenericDAOImpl.java
	Champions-profile-impl/pom.xml

	Champions-profile-impl/src/main/java/org/amazed/champions/profile/dao/UserDAOImpl.java