New test code with stuff
Merge branch 'test' of github.com:anidev/612-2014-advanced into test