Merge branch 'staging' of github.com:scrollback/scrollback into staging
Changed some of the code to conform to JS Hint
Added style.css to gitignore
Merge branch 'staging' of http://github.com/scrollback/scrollback into staging

Conflicts:
	public/sdk/controller.js
Revert "Merged admin-notifier log file change (minor)"

This reverts commit 424717d7b2ff532cddc3ae413c8c4a8d64213403.

Conflicts:

	public/sdk/controller.js
Merge branch 'staging'