stage one of js merge completed, user input passing to mapnificent
Merge pull request #22 from dlopezh/master

stage one of js merge completed, user input passing to mapnificent