Added main stuff
Merge branch 'master' of git://github.com/anidev/612-2014
Merge remote-tracking branch 'zack/master'