Merge branch 'development'
Merge branch 'development'
removed generated css files
Merge branch 'development'