Update to SDK 21
Merge branch 'master' of github.com:SLoeuillet/WIFI_EAP_SIM_Conf

Conflicts:
	.idea/misc.xml
	app/app.iml