clean unsued code
Merge branch 'master' of https://github.com/oria/gridx
Remove unused variable
simplify code
use aspect instead of connect
Fix ";" to ","
Merge branch 'master' into 1.2