fix
Merge branch 'master' of https://github.com/Tykrael/annick

Conflicts:
	index2.php
	js/main.js