Rails updated
Merge branch 'master' of github.com:jarkelen/johnvanarkelen
removed some old stuff
basic links system added
translations added
Merge branch 'links'