fdwef
Merge branch 'master' of https://github.com/bazookan/Quiz_app.git
push
To do updated and testing my theory
Made the Ankit branch error free

Signed-off-by: bazookan <aby.vinod@gmail.com>
Merge branch 'master' into Ankit_try2

Conflicts:
	lint.xml
	res/layout-land/activity_admin.xml
	res/layout-land/activity_admin_base.xml
	res/layout-land/activity_admin_chkq.xml
	res/layout-land/activity_admin_cp.xml
	res/layout-land/activity_admin_home.xml
	res/layout-land/activity_admin_login.xml
	res/layout-land/activity_admin_quest_confirm.xml
	res/layout-land/activity_admin_review.xml
	res/layout-land/activity_main.xml
	res/layout-land/activity_mainquiz.xml
	res/layout-land/activity_settings.xml
	res/layout-land/activity_user_landing.xml
	res/layout-land/activity_user_publish.xml
	res/layout-xlarge-land/activity_admin.xml
	res/layout-xlarge-land/activity_admin_base.xml
	res/layout-xlarge-land/activity_admin_chkq.xml
	res/layout-xlarge-land/activity_admin_cp.xml
	res/layout-xlarge-land/activity_admin_home.xml
	res/layout-xlarge-land/activity_admin_login.xml
	res/layout-xlarge-land/activity_admin_quest_confirm.xml
	res/layout-xlarge-land/activity_admin_review.xml
	res/layout-xlarge-land/activity_main.xml
	res/layout-xlarge-land/activity_mainquiz.xml
	res/layout-xlarge-land/activity_settings.xml
	res/layout-xlarge-land/activity_user_landing.xml
	res/layout-xlarge-land/activity_user_publish.xml
	res/values/strings.xml

Signed-off-by: bazookan <aby.vinod@gmail.com>