Fix ctrl+c in grunt / add parallel test options (default 2 parallel browser)
Merge branch 'master' of github.com:yourdelivery/JigMagga