* base controller refactorings
* some more controller refactorings
* fix
Merge branch 'jos-fork'
* fixes
* refactorings in cardtec
* added some sitenavigation stuff
* small fix
* cleanups
* some games played
* small fix
* added Me
* added models and controllers for Maker
* readded deleted assetets
* some cleanups and fixes
* cleaned up some relationship types
* added maker/topics
* some cleanups
remove unused code
lots of layout changes
merged upstream/master