General cleanings
Moved jsons to res
refs #765
Merge branch 'master' of ssh://git.braintech.pl/pisak
Changed jsons names for more straightforward
refs #765