Merge pull request #161 from zapion/v2.0

r=me
Fix the bug of Branch and Engineer/User build selection.
- the 'ACTIVE' will not get the current item.
Merge pull request #163 from askeing/v2.0

Fix the bug of Engineer/User build selection.
Merge pull request #162 from zapion/v2.0

Refactor and move tk part into a separate controller