2.2.1 build 1.12102014

Fixed js bugs