fix merge conflicts
fix merge conflicts
fix merge conflictS
fix css
fix merge conflicts
Merge pull request #69 from ospreys-2014/user_branch

User branch