Stats on user profile
Updated TODO
Merge branch 'permalinks' into dev