adding methods and callbacks
Merge remote-tracking branch 'origin/master'

Conflicts:
	modal.js
adding methods and callbacks