changed lib to notify, commented out code,
Merge remote-tracking branch 'boris_webapp/webapp' into webapp