refactor grid view
Merge remote-tracking branch 'origin/master'
controller: delete unnecessary code
Merge branch 'develop'
add eventMachine as module
Merge remote-tracking branch 'origin/develop' into develop