dev -> master

new features but same web interface.
need to add new sql dump.