files from samples + beginning for bt
files from samples + beginning for bt
Revert "files from samples + beginning for bt"

This reverts commit 488c08b0d6ce27e785b0dd7b084c952893cc785b.
added beginning of bt
beginning bt ; activity for scan added, not used yet
launching activity for discovery ; not working yet
Merge branch 'master' into btConnection

Conflicts:
	application/src/fr/insarouen/asi/notesync/NoteSync.java
	application/src/fr/insarouen/asi/notesync/sync/DeviceListActivity.java
window for scanning bt devices ok
getting the device to connect to
add forgotten file
connection ok
bt connection really ok
Add menu elements to choose between sync methods
Merge branch 'btConnection' of github.com:npmiller/notesync into btConnection
Merge branch 'master' into btConnection

Conflicts:
	application/AndroidManifest.xml
	application/res/menu/ab.xml
	application/res/values-fr/strings.xml
	application/res/values/strings.xml
	application/src/fr/insarouen/asi/notesync/NoteSync.java
Add forgotten file
launch bug without bt corrected
more bt
bt activation asked only when necessary
much bt transfer