In IE9 catch is a keyword
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop

Conflicts:
	webapp/scripts/data-options.js
	webapp/scripts/delete-resource.js
	webapp/scripts/put-file.js
Log error stack trace from editor iframe
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop
Fix typo
Remove search lookup in dropzone dialogues
Use RDFa attributes to find to closest resource element to remove
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop
Change calli.postText to be unconditional and introduce calli.updateText for conditional POST requests
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop
Rename resolve.js to promise.js
Change calli.createResource and calli.insertResource to return a promise
Close create dialogue when lookup result is clicked
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop

Conflicts:
	webapp/scripts/create-resource.js
Use progress cursor when page is waiting for background events
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop

Conflicts:
	webapp/styles/callimachus.less
Change calli.selectResource, calli.addResource, and calli.removeResource to return promises
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop
Allow calli.parseDateTime to take a string as input
Remove @value when value property changes to not confuse RDFa parsers (use @content instead)