Merge branch master
timeout changes
changed delay time
Merge branch 'master' into timeout-changes

Conflicts:
	push-notification/push-notification.js
	test/selenium/account-settings-test.js
	test/selenium/meta-area-test.js
	test/selenium/room-settings-test.js
Merge pull request #402 from scrollback/timeout-changes

Timeout changes