Add Wikipage feature.
Merge pull request #1 from ifrik/master

Add Wikipage feature.
Merge branch 'master' into openshift
added new feature for content type locations
changed the wikipage feature to the latest commit
Merge pull request #2 from ifrik/master

New location content type.

Yay now we can list places to go out.
Merge remote-tracking branch 'origin/master' into openshift