pricing final updates
removed admin directory (it is in amber)
removed admin directory (it is in amber)
removed admin from frontus (should be in amber)
removed unnecessary clem
adding tags.inc
revert changes for .cat
Merge branch 'master' into alan
added direct messaging section to /features
Merge remote-tracking branch 'origin/master' into r0ml

Conflicts:
	i/tags.inc
Merge remote-tracking branch 'origin/master' into r0ml