Merge 1.2.0 (!6 · Merge requests · Q4SG / Web / Frontend

Merged Adam "MrBond" Ziegler requested to merge 1.2.x into master Sep 23, 2017

Can't show this merge request because the source branch 1.2.x is missing from project q4sg/web/Frontend. Close this merge request or update the source branch.