add modal position
Merge remote-tracking branch 'origin/master'

Conflicts:
	template/js/script.js