changed annotation name
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ge/edu/sangu/unisys/models/mongo/User.java