fix eclipse issues
Merge pull request #12 from m1688/fix_eclipse_package

fix eclipse issues
revert changes
Merge pull request #13 from m1688/add_bootstrap_revert

revert changes
add git ignore
Merge pull request #14 from m1688/add_bootstrap_revert

add git ignore
revert add boostrap
Revert "revert add boostrap"

This reverts commit 1817a50aa5054cea83a626cedec19b1210a128d0.
revert bootstrap
Merge pull request #15 from m1688/add_bootstrap_revert

Add bootstrap revert
change style
Merge branch 'master' of https://github.com/m1688/Hirebird

Conflicts:
	res/values/styles.xml