+popup window
Merge branch 'master' of https://github.com/asgh722/Pixlate.git

Conflicts:
	Web/untranslated.html