Merge pull request #1 from lgroschen/master

lgroschen/nsti/master
Merge pull request #2 from lgroschen/frontend

Frontend
Updating still broken
Fixed some gamebreaking items (such as Python syntax errors before moving to a new branch for the filtering code.)
Merge remote branch 'upstream/master' into frontend

Conflicts:
	nsti/templates/trapview/traplist.html