Merge pull request #6 from pedroigor/picketlink-relationship

Realm. Tier and File-based store changes
Merge remote-tracking branch 'shane/master' into picketlink-relationship
Code refactoring.