commit for merge
Merge branch 'master' of https://github.com/almende/virtuele-memo

Conflicts:
	cordova/com.almende.VirtualMemo/plugins/ios.json
	cordova/com.almende.VirtualMemo/www/js/WotsApp.js
	cordova/com.almende.VirtualMemo/www/js/ble.js
Resolved conflicts
iBeacon seperated from memo
Merge branch 'master' of https://github.com/almende/virtuele-memo
Geo-fencing enabled for stands
Merge branch 'master' of https://github.com/almende/virtuele-memo

Conflicts:
	cordova/com.almende.VirtualMemo/www/index.html
	cordova/com.almende.VirtualMemo/www/js/WotsApp.js