1 step of refresh master branch
add gitignore files
add gitignore files
init commit for project with native scanner plugin
rename application
refactor main.js and new plugin for swipe
Merge branch 'master' of github.com:wipon/mobile-app

Conflicts:
	platforms/ios/www/css/main.css
	platforms/ios/www/css/main.css.map
	platforms/ios/www/css/main.sass
	platforms/ios/www/index.html
	platforms/ios/www/js/main.js
	www/index.html
configure ios repo
add action to scan button
Fix main.js, add underscreen and load icon
Merge branch 'master' of github.com:wipon/mobile-app

Conflicts:
	www/index.html
	www/js/index.js
some fixes load screen
Some changes in orientation and camera script
add plugin
Merge branch 'master' of github.com:wipon/mobile-app
bg now is swipable
Merge branch 'master' of github.com:wipon/mobile-app
Merge branch 'master' into manateeworks

Conflicts:
	README.md
	platforms/android/AndroidManifest.xml
	platforms/android/res/xml/config.xml
	platforms/android/src/com/manateeworks/BarcodeScannerPlugin.java
	platforms/android/src/com/manateeworks/ScannerActivity.java
	platforms/android/src/org/apache/cordova/vibration/Vibration.java
	platforms/ios/Wipon.xcodeproj/project.pbxproj
	platforms/ios/Wipon/Plugins/com.manateeworks.barcodescanner/MWBarcodeScanner/MWScannerViewController.m
	platforms/ios/Wipon/config.xml
	platforms/ios/www/cordova_plugins.js
	platforms/ios/www/plugins/com.manateeworks.barcodescanner/www/MWBScanner.js
	plugins/android.json
	plugins/com.manateeworks.barcodescanner/www/MWBScanner.js
	plugins/ios.json
	www/app/MWBScanner.js
	www/css/main.css
	www/css/main.css.map
	www/css/main.sass
	www/index.html
	www/js/main.js