updating the code from pull #1 of wso2-dev/carbon-identity
updating the code from pull #12 of wso2-dev/carbon-identity
Merge branch 'master' of https://github.com/wso2-dev/carbon-identity
Adding facebook authenticator v2 from svn
Merge remote-tracking branch 'pulasthi/master' into pushmaster

Conflicts:
	components/security/org.wso2.carbon.security.mgt/src/main/java/org/wso2/carbon/security/pox/POXSecurityHandler.java
Merge pull request #24 from Pushpalanka/master

Merging changes from pulasthi master