code refactoring
Merge pull request #49 from vatseek/remarks

code refactoring
contacts fix
Merge pull request #50 from vatseek/contact

contacts fix
rename needed js files
Merge pull request #51 from lensky84/rename_js

rename needed js files
Merge remote-tracking branch 'upstream/master' into dev