Empty phonegap project
notification
initial project
initial commit
test
sign-up-in-out
1
Merge branch 'Mehdi' of https://github.com/mmpourhashem/lindam

Conflicts:
	LINDA/platforms/android/cordova/android_sdk_version
	LINDA/platforms/android/cordova/build
	LINDA/platforms/android/cordova/check_reqs
	LINDA/platforms/android/cordova/clean
	LINDA/platforms/android/cordova/lib/android_sdk_version.js
	LINDA/platforms/android/cordova/lib/install-device
	LINDA/platforms/android/cordova/lib/install-emulator
	LINDA/platforms/android/cordova/lib/list-devices
	LINDA/platforms/android/cordova/lib/list-emulator-images
	LINDA/platforms/android/cordova/lib/list-started-emulators
	LINDA/platforms/android/cordova/lib/start-emulator
	LINDA/platforms/android/cordova/log
	LINDA/platforms/android/cordova/node_modules/.bin/shjs
	LINDA/platforms/android/cordova/node_modules/shelljs/bin/shjs
	LINDA/platforms/android/cordova/node_modules/shelljs/scripts/generate-docs.js
	LINDA/platforms/android/cordova/node_modules/shelljs/scripts/run-tests.js
	LINDA/platforms/android/cordova/run
	LINDA/platforms/android/cordova/version