and again some fixes...i'll hope it's last one)
Merge branch 'master' of https://github.com/revan-kun/inTouch.git