Merge branch 'hotfix/20141216-applibot'
Merge branch 'develop'
tv&ch
Merge branch 'hotfix/20141216-tv' into develop