Merge branch 'develop'
<master-2014/2/14-10:38>
Merge remote-tracking branch 'origin/develop' into develop
<develop-2014/2/17-18:10> debugging