[Fixed] welcome message
[Edit] add tags to search form
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Nagrand/c3-web