analytics changed
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	index.php
fixes # 31| more fixes
more stuff
fixes #33 | modal uncomplete