Added assertions for required objects/functions
Merge branch 'master' into 1095-fix-add-feature-button-for-torque
Revert change to updateDataLayerView

Will work with fix #214 on cartodb.js, will be updated once released.
Run JS build on grunt watch:js startup

To not have to force a file change to get the initial build
Update cartodb.js
Merge branch 'master' into 1095-fix-add-feature-button-for-torque
Updated NEWS
Merge branch 'master' into 1095-fix-add-feature-button-for-torque
Merge branch '1095-fix-add-feature-button-for-torque'

Conflicts:
	NEWS.md