Expiriment with a iBeaon lib
Merge branch 'master' of https://github.com/almende/virtuele-memo

Conflicts:
	cordova/com.almende.VirtualMemo/platforms/android/AndroidManifest.xml
	cordova/com.almende.VirtualMemo/platforms/android/assets/www/cordova_plugins.js
	cordova/com.almende.VirtualMemo/plugins/android.json
	cordova/com.almende.VirtualMemo/plugins/ios.json
Resolved conflicts