Expand tags array to an associative array so it's easier to access the properties in the template e.g. it.tags["new"]
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore