Code cleanup
Fixed permalinks
Merge branch 'master' of git.defora.org:DaPortal