Merge branch 'feature/yepnope' into develop
Merge branch 'develop' of github.com:kojinkai/bd_2013 into develop
Merge branch 'develop' of github.com:kojinkai/bd_2013 into develop
Merge conflict