not working : /
not working : /
Merge remote-tracking branch 'origin/guildAchievements' into guildAchievements

Conflicts:
	public/js/services.js
recoded achievements checking
Merge branch 'development' into guildAchievements

Conflicts:
	public/js/services.js
recoded achievements checking
achievements working
removed some errors
removed placeholder data
mop normals working