Merge branch 'master' of github.com:PuMpKinG/MIS_SnipWik

Conflicts:
	controller/12-detailspage.js