commit
Merge branch 'master' of https://github.com/YasithaBangamuwage/SNCA-API

Conflicts:

	SocialNetworkContentAnalyzerAPI/src/com/contentanalyzer/springservice/domain/Classification.java