restricted tags for grical use
Merge branch 'grical-post' into devel
incremented version number
Merge branch 'devel'

Conflicts:
	templates/bottom.php