upgraded facebook login plugin to handle accesstoken expires parameter
refactoring service classes for circular dep
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0
Merge branch 'biodiv2.0' into locale