b749c81 Feb 16, 2015
@yonip yonip Merge final version from alpha_test to master
@maxyu2006 @AliAnwar7477 @gabeu @emjin @eyob-- @anbarth @yonip @Paiku @koolblitz