solved conflict
solved conflict

solved conflict on 05/04 05:14
after Jeffrey merged controller and model
pull from master
pull from origin/develop
article controller and views done

1. article views
2. article controller
3. modify tags_* to *_tag_ships
delete tags_* model
sync with 'complete model'