Fixed display_name in queries
Merge branch 'kostas'
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git

Conflicts:
	GitWarriorSolution/src/database/dao/PostDAO.java
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git