merged

crossed fingers!
Merge branch 'master' of https://github.com/jihyunlee/BLEManagerApp

Conflicts:
	platforms/ios/www/css/index.css
	platforms/ios/www/index.html
	platforms/ios/www/js/index.js
	www/css/index.css
	www/index.html
add gitignore project file
add gitignore project settings