[VN] SlimScroll returns for non touch devices
Bump version to 2.5.3
Merge branch 'release/2.5.3' into develop
fixed running jasmine through phantom after using jasmine 2.x How many hipster words can we use in one sentence...grunt
Merge branch 'develop' of github.com:expectlabs/mindmeld-js-sdk into develop
2 spaces for jasmine runner
added unit test for MM.get, finally
updated default timeout comment
Merge branch 'develop' into feature/decouple-js-sdk

Conflicts:
	README.md
	dist/sdk/mindmeld-js-sdk.zip
	dist/sdk/mindmeld.min.js
	dist/widgets/searchWidget/mindmeldSearchWidget.js
	dist/widgets/voiceNavigator/modal/modal.js
	dist/widgets/voiceNavigator/modal/modal.min.js