Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Fixed whitespace issue.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'staging' into develop

Conflicts:
	public/vendor/redactor/css/style.css
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Fixed merges.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'staging' into develop

Conflicts:
	public/vendor/delta/js/custom.js
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop
Merge branch 'staging' into develop