Merge branch 'Develop'
Merge branch 'Develop'
Bugfix delete comment
+ Layout fix (date)
Merge branch 'master' into Develop