fixes #31 | refactoring code, uncomplete
fixes # 31 | refactoring code
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	index.php
fixes # 31| more fixes
more stuff
fixes #33 | modal uncomplete
modal fixes
less js added to development porposes
close #30
close #34
close #33 | close #32 | close #29
v2.2.2 ready