Index merge with green2013
Merge remote-tracking branch 'origin/beta' into beta
Base and common Controller
Small Changes
Small Prepare
Clean up
Merge pull request #3 from zts1993/master

Small fix
Merge pull request #4 from zts1993/beta

Update Now