Merge pull request #139 from pedroigor/master

[PLINK-177] - The IdentityManagerFactory must be serializable to allow @SessionScoped injection points.
PLINK-179: FORM Authentication mech
Merge pull request #140 from anilsaldhana/master

see comments
Merge remote-tracking branch 'upstream/master'