Merge branch 'hotfix/1403591018'
fix BuildConfig path
Merge branch 'hotfix/1403591214' into develop