commit pré pull
Merge branch 'master' of https://github.com/mvolganli/neerdy.git

Conflicts:
	Neerdy App/models/DataModel.js
MAJ FriendAddViewModel.js