Merge branch 'hotfix/20140129-math'
Remove unused library
Merge branch 'hotfix/20140203' into develop