new merge for pull
new merge for pull
new merge for pull
Add questionnary
Merge branch 'master' of https://github.com/Daisuki91/NuitdeLInfo

Conflicts:
	android/gen/com/example/methcommerce/R.java
	android/res/values/strings.xml
	android/src/com/example/methcommerce/MainActivity.java