Returned removed changes from merge problemes. Fixes #51.
Did nothing.
Merge branch 'master' of github.com:Tuxion/tuxion.cms