change icon
add console.log for testing
add console.log
moep
add console.log
Merge remote-tracking branch 'origin/dev' into dev
Merged 'dev'.

Conflicts:
	app/comps/core/files/srvc-files-adapter.js
update start routes
update quickstart
on step next key generation will start with keysize 2048
updated test data for stage
update route after canceling automatic generated key
fixxed base64 problem at passcaptcha
captcha now 100% width
clear console.log
update settings routes
Finish fairphone-image-problem
update app settings list icons
Merge remote-tracking branch 'origin/feature-widgets' into feature-widgets

Conflicts:
	templates/app/main.js
update
update config path
update config
Merge remote-tracking branch 'origin/dev' into dev