Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:
Code/FriendFinderApplication/project.properties
ignore properties file