tags system, jquery chosen
Merge remote-tracking branch 'origin/master'