Merge pull request #64 from luixxiul/development

js files combined, 2 js deleted
Merge branch 'master' into development
images, weber