Merge pull request #3 from nkashyap/dev

bug fixes and some new features
Update package.json

correct version
Merge branch 'dev'

Conflicts:
	package.json
Merge pull request #5 from nkashyap/dev

Panasonic, PhantonJS & Toshiba 2013 support added
Merge pull request #6 from nkashyap/dev

Redis support removed, CodeMirror updated
Merge pull request #7 from nkashyap/dev

Fixed cookie issue
base version updated
Merge branch 'master' into dev

Conflicts:
	package.json