update gitignore path
update bootstrap of bower
add dist folder of bootstrap
Merge branch 'feature_mybatis_mapper' into develop
Merge branch 'develop'