Modify meta descriptions
Merge branch 'master' of github.com:teampopong/pokr

Conflicts:
	pokr/templates/layout.html