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

Conflicts:
	public/js/services.js
recoded achievements checking