layout change and project merged
constraints on all screens reviewed and fixed
Merge remote-tracking branch 'origin/master' into JosipBranch
Merged with master