Merge branch 'develop'
Merge branch 'develop'
new icons
minor changes
README
added pymysql
added pymysql
added pymysql
added pymysql
added pymysql
added pymysql
added pymysql
removed css and js compression until solve problem with server
Merge branch 'master' into develop