Merge remote-tracking branch 'upstream/master' into development
stuff
Merge remote-tracking branch 'upstream/next' into development
changed layout header colors
Merge remote-tracking branch 'upstream/next' into development
Merge branch 'development' into next