modified textarea and styling it wit css
conflict merged
dashboard images replaced by icons
Merge branch 'development' of https://github.com/MakersSpark/Maker-Spark-Server into development