Change app name to yaksh

118 files changed, 178 insertions, 119 deletions

diff --git a/testapp/tests/test_bash_evaluation.py b/testapp/tests/test_bash_evaluation.py
index fd906da..924c560 100644
--- a/testapp/tests/test_bash_evaluation.py
+++ b/testapp/tests/test_bash_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.exam.bash_code_evaluator import BashCodeEvaluator
-from testapp.exam.settings import SERVER_TIMEOUT
+from testapp.yaksh_app.bash_code_evaluator import BashCodeEvaluator
+from testapp.yaksh_app.settings import SERVER_TIMEOUT
 
 class BashEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/tests/test_c_cpp_evaluation.py b/testapp/tests/test_c_cpp_evaluation.py
index fbb8769..3d7f09d 100644
--- a/testapp/tests/test_c_cpp_evaluation.py
+++ b/testapp/tests/test_c_cpp_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.exam.cpp_code_evaluator import CppCodeEvaluator
-from testapp.exam.settings import SERVER_TIMEOUT
+from testapp.yaksh_app.cpp_code_evaluator import CppCodeEvaluator
+from testapp.yaksh_app.settings import SERVER_TIMEOUT
 
 class CEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/tests/test_code_evaluation.py b/testapp/tests/test_code_evaluation.py
index a13eccc..9f0885f 100644
--- a/testapp/tests/test_code_evaluation.py
+++ b/testapp/tests/test_code_evaluation.py
@@ -1,8 +1,8 @@
 import unittest
 import os
-from testapp.exam import python_code_evaluator
-from testapp.exam.language_registry import _LanguageRegistry, set_registry, get_registry
-from testapp.exam.settings import SERVER_TIMEOUT
+from testapp.yaksh_app import python_code_evaluator
+from testapp.yaksh_app.language_registry import _LanguageRegistry, set_registry, get_registry
+from testapp.yaksh_app.settings import SERVER_TIMEOUT
 
 
 class RegistryTestCase(unittest.TestCase):
@@ -13,7 +13,7 @@ class RegistryTestCase(unittest.TestCase):
 
     def test_set_register(self):
         class_name = getattr(python_code_evaluator, 'PythonCodeEvaluator')
-        self.registry_object.register("python", "testapp.exam.python_code_evaluator.PythonCodeEvaluator")
+        self.registry_object.register("python", "testapp.yaksh_app.python_code_evaluator.PythonCodeEvaluator")
         self.assertEquals(self.registry_object.get_class("python"), class_name)
 
     def tearDown(self):
diff --git a/testapp/tests/test_java_evaluation.py b/testapp/tests/test_java_evaluation.py
index 23d8bf4..8e1fdeb 100644
--- a/testapp/tests/test_java_evaluation.py
+++ b/testapp/tests/test_java_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.exam import code_evaluator as evaluator
-from testapp.exam.java_code_evaluator import JavaCodeEvaluator
+from testapp.yaksh_app import code_evaluator as evaluator
+from testapp.yaksh_app.java_code_evaluator import JavaCodeEvaluator
 
 
 class JavaEvaluationTestCases(unittest.TestCase):
diff --git a/testapp/tests/test_python_evaluation.py b/testapp/tests/test_python_evaluation.py
index 68435c5..7039b75 100644
--- a/testapp/tests/test_python_evaluation.py
+++ b/testapp/tests/test_python_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.exam.python_code_evaluator import PythonCodeEvaluator
-from testapp.exam.settings import SERVER_TIMEOUT
+from testapp.yaksh_app.python_code_evaluator import PythonCodeEvaluator
+from testapp.yaksh_app.settings import SERVER_TIMEOUT
 
 class PythonEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/tests/test_scilab_evaluation.py b/testapp/tests/test_scilab_evaluation.py
index 4c3704d..346060a 100644
--- a/testapp/tests/test_scilab_evaluation.py
+++ b/testapp/tests/test_scilab_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.exam.scilab_code_evaluator import ScilabCodeEvaluator
-from testapp.exam.settings import SERVER_TIMEOUT
+from testapp.yaksh_app.scilab_code_evaluator import ScilabCodeEvaluator
+from testapp.yaksh_app.settings import SERVER_TIMEOUT
 
 class ScilabEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/urls.py b/testapp/urls.py
index 0d126f4..4547232 100644
--- a/testapp/urls.py
+++ b/testapp/urls.py
@@ -14,7 +14,7 @@ else:
     ADMIN_BASE = r'^admin/'
 
 urlpatterns = patterns('',
-    url(URL_BASE, include('exam.urls')),
+    url(URL_BASE, include('yaksh_app.urls')),
     #url(r'^admin/', include(admin.site.urls)),
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
diff --git a/testapp/exam/__init__.py b/testapp/yaksh_app/__init__.py
index e69de29..e69de29 100644
--- a/testapp/exam/__init__.py
+++ b/testapp/yaksh_app/__init__.py
diff --git a/testapp/exam/admin.py b/testapp/yaksh_app/admin.py
index 86a10af..e0a7741 100644
--- a/testapp/exam/admin.py
+++ b/testapp/yaksh_app/admin.py
@@ -1,4 +1,4 @@
-from testapp.exam.models import Question, Quiz, TestCase
+from testapp.yaksh_app.models import Question, Quiz, TestCase
 from django.contrib import admin
 
 admin.site.register(Question)
diff --git a/testapp/exam/bash_code_evaluator.py b/testapp/yaksh_app/bash_code_evaluator.py
index a468fd7..a468fd7 100644
--- a/testapp/exam/bash_code_evaluator.py
+++ b/testapp/yaksh_app/bash_code_evaluator.py
diff --git a/testapp/exam/bash_files/sample.args b/testapp/yaksh_app/bash_files/sample.args
index 4d9f00d..4d9f00d 100644
--- a/testapp/exam/bash_files/sample.args
+++ b/testapp/yaksh_app/bash_files/sample.args
diff --git a/testapp/exam/bash_files/sample.sh b/testapp/yaksh_app/bash_files/sample.sh
index e935cb3..e935cb3 100755
--- a/testapp/exam/bash_files/sample.sh
+++ b/testapp/yaksh_app/bash_files/sample.sh
diff --git a/testapp/exam/c_cpp_files/main.cpp b/testapp/yaksh_app/c_cpp_files/main.cpp
index ebe1f08..ebe1f08 100755
--- a/testapp/exam/c_cpp_files/main.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main.cpp
diff --git a/testapp/exam/c_cpp_files/main2.c b/testapp/yaksh_app/c_cpp_files/main2.c
index ccd1768..ccd1768 100755
--- a/testapp/exam/c_cpp_files/main2.c
+++ b/testapp/yaksh_app/c_cpp_files/main2.c
diff --git a/testapp/exam/c_cpp_files/main_array_check.cpp b/testapp/yaksh_app/c_cpp_files/main_array_check.cpp
index ea34fdd..ea34fdd 100755
--- a/testapp/exam/c_cpp_files/main_array_check.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_array_check.cpp
diff --git a/testapp/exam/c_cpp_files/main_array_check_all.cpp b/testapp/yaksh_app/c_cpp_files/main_array_check_all.cpp
index 140578e..140578e 100755
--- a/testapp/exam/c_cpp_files/main_array_check_all.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_array_check_all.cpp
diff --git a/testapp/exam/c_cpp_files/main_array_sum.cpp b/testapp/yaksh_app/c_cpp_files/main_array_sum.cpp
index 55b2ebf..55b2ebf 100755
--- a/testapp/exam/c_cpp_files/main_array_sum.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_array_sum.cpp
diff --git a/testapp/exam/c_cpp_files/main_blackJack.cpp b/testapp/yaksh_app/c_cpp_files/main_blackJack.cpp
index cc54e78..cc54e78 100755
--- a/testapp/exam/c_cpp_files/main_blackJack.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_blackJack.cpp
diff --git a/testapp/exam/c_cpp_files/main_check_digit.cpp b/testapp/yaksh_app/c_cpp_files/main_check_digit.cpp
index d3bf3d6..d3bf3d6 100755
--- a/testapp/exam/c_cpp_files/main_check_digit.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_check_digit.cpp
diff --git a/testapp/exam/c_cpp_files/main_count667.cpp b/testapp/yaksh_app/c_cpp_files/main_count667.cpp
index f146e8c..f146e8c 100755
--- a/testapp/exam/c_cpp_files/main_count667.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_count667.cpp
diff --git a/testapp/exam/c_cpp_files/main_count7.cpp b/testapp/yaksh_app/c_cpp_files/main_count7.cpp
index 982e930..982e930 100755
--- a/testapp/exam/c_cpp_files/main_count7.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_count7.cpp
diff --git a/testapp/exam/c_cpp_files/main_fact.cpp b/testapp/yaksh_app/c_cpp_files/main_fact.cpp
index a4ff230..a4ff230 100755
--- a/testapp/exam/c_cpp_files/main_fact.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_fact.cpp
diff --git a/testapp/exam/c_cpp_files/main_greatest.cpp b/testapp/yaksh_app/c_cpp_files/main_greatest.cpp
index 6d0a7c2..6d0a7c2 100755
--- a/testapp/exam/c_cpp_files/main_greatest.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_greatest.cpp
diff --git a/testapp/exam/c_cpp_files/main_hello_name.c b/testapp/yaksh_app/c_cpp_files/main_hello_name.c
index 71b83a2..71b83a2 100755
--- a/testapp/exam/c_cpp_files/main_hello_name.c
+++ b/testapp/yaksh_app/c_cpp_files/main_hello_name.c
diff --git a/testapp/exam/c_cpp_files/main_lessThan9.cpp b/testapp/yaksh_app/c_cpp_files/main_lessThan9.cpp
index 722b4bb..722b4bb 100755
--- a/testapp/exam/c_cpp_files/main_lessThan9.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_lessThan9.cpp
diff --git a/testapp/exam/c_cpp_files/main_mean.cpp b/testapp/yaksh_app/c_cpp_files/main_mean.cpp
index 21a4b1a..21a4b1a 100755
--- a/testapp/exam/c_cpp_files/main_mean.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_mean.cpp
diff --git a/testapp/exam/c_cpp_files/main_palindrome.cpp b/testapp/yaksh_app/c_cpp_files/main_palindrome.cpp
index 0e66928..0e66928 100755
--- a/testapp/exam/c_cpp_files/main_palindrome.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_palindrome.cpp
diff --git a/testapp/exam/c_cpp_files/main_roundTo10.cpp b/testapp/yaksh_app/c_cpp_files/main_roundTo10.cpp
index 12c961d..12c961d 100755
--- a/testapp/exam/c_cpp_files/main_roundTo10.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_roundTo10.cpp
diff --git a/testapp/exam/c_cpp_files/main_specialSum.cpp b/testapp/yaksh_app/c_cpp_files/main_specialSum.cpp
index d614536..d614536 100755
--- a/testapp/exam/c_cpp_files/main_specialSum.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_specialSum.cpp
diff --git a/testapp/exam/c_cpp_files/main_within.cpp b/testapp/yaksh_app/c_cpp_files/main_within.cpp
index 50f9ad0..50f9ad0 100755
--- a/testapp/exam/c_cpp_files/main_within.cpp
+++ b/testapp/yaksh_app/c_cpp_files/main_within.cpp
diff --git a/testapp/exam/code_evaluator.py b/testapp/yaksh_app/code_evaluator.py
index 381b2e8..381b2e8 100644
--- a/testapp/exam/code_evaluator.py
+++ b/testapp/yaksh_app/code_evaluator.py
diff --git a/testapp/exam/code_server.py b/testapp/yaksh_app/code_server.py
index 2593752..2593752 100755
--- a/testapp/exam/code_server.py
+++ b/testapp/yaksh_app/code_server.py
diff --git a/testapp/exam/cpp_code_evaluator.py b/testapp/yaksh_app/cpp_code_evaluator.py
index 7242884..7242884 100644
--- a/testapp/exam/cpp_code_evaluator.py
+++ b/testapp/yaksh_app/cpp_code_evaluator.py
diff --git a/testapp/exam/docs/sample.args b/testapp/yaksh_app/docs/sample.args
index 4d9f00d..4d9f00d 100644
--- a/testapp/exam/docs/sample.args
+++ b/testapp/yaksh_app/docs/sample.args
diff --git a/testapp/exam/docs/sample.sh b/testapp/yaksh_app/docs/sample.sh
index e935cb3..e935cb3 100755
--- a/testapp/exam/docs/sample.sh
+++ b/testapp/yaksh_app/docs/sample.sh
diff --git a/testapp/exam/docs/sample_questions.py b/testapp/yaksh_app/docs/sample_questions.py
index 60f32cb..60f32cb 100644
--- a/testapp/exam/docs/sample_questions.py
+++ b/testapp/yaksh_app/docs/sample_questions.py
diff --git a/testapp/exam/docs/sample_questions.xml b/testapp/yaksh_app/docs/sample_questions.xml
index 53c76f8..53c76f8 100644
--- a/testapp/exam/docs/sample_questions.xml
+++ b/testapp/yaksh_app/docs/sample_questions.xml
diff --git a/testapp/exam/forms.py b/testapp/yaksh_app/forms.py
index 124d79f..c0b5cdc 100644
--- a/testapp/exam/forms.py
+++ b/testapp/yaksh_app/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from testapp.exam.models import Profile, Quiz, Question, TestCase
+from testapp.yaksh_app.models import Profile, Quiz, Question, TestCase
 
 from django.contrib.auth import authenticate
 from django.contrib.auth.models import User
diff --git a/testapp/exam/java_code_evaluator.py b/testapp/yaksh_app/java_code_evaluator.py
index 4367259..4367259 100644
--- a/testapp/exam/java_code_evaluator.py
+++ b/testapp/yaksh_app/java_code_evaluator.py
diff --git a/testapp/exam/java_files/main_array_sum.java b/testapp/yaksh_app/java_files/main_array_sum.java
index 5eae299..5eae299 100644
--- a/testapp/exam/java_files/main_array_sum.java
+++ b/testapp/yaksh_app/java_files/main_array_sum.java
diff --git a/testapp/exam/java_files/main_fact.java b/testapp/yaksh_app/java_files/main_fact.java
index 325dab6..325dab6 100644
--- a/testapp/exam/java_files/main_fact.java
+++ b/testapp/yaksh_app/java_files/main_fact.java
diff --git a/testapp/exam/java_files/main_great.java b/testapp/yaksh_app/java_files/main_great.java
index 4bfcb1f..4bfcb1f 100644
--- a/testapp/exam/java_files/main_great.java
+++ b/testapp/yaksh_app/java_files/main_great.java
diff --git a/testapp/exam/java_files/main_hello_name.java b/testapp/yaksh_app/java_files/main_hello_name.java
index 84bb282..84bb282 100644
--- a/testapp/exam/java_files/main_hello_name.java
+++ b/testapp/yaksh_app/java_files/main_hello_name.java
diff --git a/testapp/exam/java_files/main_lastDigit.java b/testapp/yaksh_app/java_files/main_lastDigit.java
index 05439e2..05439e2 100644
--- a/testapp/exam/java_files/main_lastDigit.java
+++ b/testapp/yaksh_app/java_files/main_lastDigit.java
diff --git a/testapp/exam/java_files/main_moreThan30.java b/testapp/yaksh_app/java_files/main_moreThan30.java
index 7da31cb..7da31cb 100644
--- a/testapp/exam/java_files/main_moreThan30.java
+++ b/testapp/yaksh_app/java_files/main_moreThan30.java
diff --git a/testapp/exam/java_files/main_palindrome.java b/testapp/yaksh_app/java_files/main_palindrome.java
index c0745f9..c0745f9 100644
--- a/testapp/exam/java_files/main_palindrome.java
+++ b/testapp/yaksh_app/java_files/main_palindrome.java
diff --git a/testapp/exam/java_files/main_square.java b/testapp/yaksh_app/java_files/main_square.java
index 5cb8c35..5cb8c35 100644
--- a/testapp/exam/java_files/main_square.java
+++ b/testapp/yaksh_app/java_files/main_square.java
diff --git a/testapp/exam/language_registry.py b/testapp/yaksh_app/language_registry.py
index 76a23d7..76a23d7 100644
--- a/testapp/exam/language_registry.py
+++ b/testapp/yaksh_app/language_registry.py
diff --git a/testapp/exam/management/__init__.py b/testapp/yaksh_app/management/__init__.py
index e69de29..e69de29 100644
--- a/testapp/exam/management/__init__.py
+++ b/testapp/yaksh_app/management/__init__.py
diff --git a/testapp/exam/management/commands/__init__.py b/testapp/yaksh_app/management/commands/__init__.py
index e69de29..e69de29 100644
--- a/testapp/exam/management/commands/__init__.py
+++ b/testapp/yaksh_app/management/commands/__init__.py
diff --git a/testapp/exam/management/commands/add_group.py b/testapp/yaksh_app/management/commands/add_group.py
index 76cc655..db0ebb6 100644
--- a/testapp/exam/management/commands/add_group.py
+++ b/testapp/yaksh_app/management/commands/add_group.py
@@ -15,7 +15,7 @@ class Command(BaseCommand):
     help = 'Adds the moderator group'
 
     def handle(self, *args, **options):
-        app = 'exam'
+        app = 'yaksh_app'
         group = Group(name='moderator')
         try:
             group.save()
diff --git a/testapp/exam/management/commands/dump_user_data.py b/testapp/yaksh_app/management/commands/dump_user_data.py
index c5537e5..2c1a108 100644
--- a/testapp/exam/management/commands/dump_user_data.py
+++ b/testapp/yaksh_app/management/commands/dump_user_data.py
@@ -5,8 +5,8 @@ from django.core.management.base import BaseCommand
 from django.template import Template, Context
 
 # Local imports.
-from testapp.exam.views import get_user_data
-from testapp.exam.models import User
+from testapp.yaksh_app.views import get_user_data
+from testapp.yaksh_app.models import User
 
 data_template = Template('''\
 ===============================================================================
diff --git a/testapp/exam/management/commands/load_exam.py b/testapp/yaksh_app/management/commands/load_exam.py
index c4a34a3..9163fdc 100644
--- a/testapp/exam/management/commands/load_exam.py
+++ b/testapp/yaksh_app/management/commands/load_exam.py
@@ -5,7 +5,7 @@ from os.path import basename
 from django.core.management.base import BaseCommand
 
 # Local imports.
-from testapp.exam.models import Question, Quiz
+from testapp.yaksh_app.models import Question, Quiz
 
 def clear_exam():
     """Deactivate all questions from the database."""
diff --git a/testapp/exam/management/commands/load_questions_xml.py b/testapp/yaksh_app/management/commands/load_questions_xml.py
index 3e13ae1..7bde9e9 100644
--- a/testapp/exam/management/commands/load_questions_xml.py
+++ b/testapp/yaksh_app/management/commands/load_questions_xml.py
@@ -8,7 +8,7 @@ import re
 from django.core.management.base import BaseCommand
 
 # Local imports.
-from testapp.exam.models import Question
+from testapp.yaksh_app.models import Question
 
 def decode_html(html_str):
     """Un-escape or decode HTML strings to more usable Python strings.
diff --git a/testapp/exam/management/commands/results2csv.py b/testapp/yaksh_app/management/commands/results2csv.py
index 1cdf8e3..c9b05ce 100644
--- a/testapp/exam/management/commands/results2csv.py
+++ b/testapp/yaksh_app/management/commands/results2csv.py
@@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand
 from django.template import Template, Context
 
 # Local imports.
-from testapp.exam.models import Quiz, QuestionPaper
+from testapp.yaksh_app.models import Quiz, QuestionPaper
 
 result_template = Template('''\
 "name","username","rollno","email","answered","total","attempts","position",\
diff --git a/testapp/exam/models.py b/testapp/yaksh_app/models.py
index 9e37ef5..9e37ef5 100644
--- a/testapp/exam/models.py
+++ b/testapp/yaksh_app/models.py
diff --git a/testapp/exam/output/README.txt b/testapp/yaksh_app/output/README.txt
index 3163ed4..3163ed4 100644
--- a/testapp/exam/output/README.txt
+++ b/testapp/yaksh_app/output/README.txt
diff --git a/testapp/exam/python_code_evaluator.py b/testapp/yaksh_app/python_code_evaluator.py
index 0c473cf..0c473cf 100644
--- a/testapp/exam/python_code_evaluator.py
+++ b/testapp/yaksh_app/python_code_evaluator.py
diff --git a/testapp/exam/scilab_code_evaluator.py b/testapp/yaksh_app/scilab_code_evaluator.py
index 392cd45..392cd45 100644
--- a/testapp/exam/scilab_code_evaluator.py
+++ b/testapp/yaksh_app/scilab_code_evaluator.py
diff --git a/testapp/exam/scilab_files/test_add.sce b/testapp/yaksh_app/scilab_files/test_add.sce
index a317cdb..a317cdb 100644
--- a/testapp/exam/scilab_files/test_add.sce
+++ b/testapp/yaksh_app/scilab_files/test_add.sce
diff --git a/testapp/exam/settings.py b/testapp/yaksh_app/settings.py
index 55c82dc..9039250 100644
--- a/testapp/exam/settings.py
+++ b/testapp/yaksh_app/settings.py
@@ -1,5 +1,5 @@
 """
-settings for exam app.
+settings for yaksh_app app.
 """
 # The ports the code server should run on.  This will run one separate
 # server for each port listed in the following list.
diff --git a/testapp/exam/static/exam/css/autotaggit.css b/testapp/yaksh_app/static/yaksh_app/css/autotaggit.css
index ed856ce..ed856ce 100644
--- a/testapp/exam/static/exam/css/autotaggit.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/autotaggit.css
diff --git a/testapp/exam/static/exam/css/base.css b/testapp/yaksh_app/static/yaksh_app/css/base.css
index 3570098..3570098 100644
--- a/testapp/exam/static/exam/css/base.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/base.css
diff --git a/testapp/exam/static/exam/css/gradeuser.css b/testapp/yaksh_app/static/yaksh_app/css/gradeuser.css
index 07b1079..07b1079 100644
--- a/testapp/exam/static/exam/css/gradeuser.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/gradeuser.css
diff --git a/testapp/exam/static/exam/css/login.css b/testapp/yaksh_app/static/yaksh_app/css/login.css
index a10cbaa..a10cbaa 100644
--- a/testapp/exam/static/exam/css/login.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/login.css
diff --git a/testapp/exam/static/exam/css/monitor.css b/testapp/yaksh_app/static/yaksh_app/css/monitor.css
index b16c8b3..b16c8b3 100644
--- a/testapp/exam/static/exam/css/monitor.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/monitor.css
diff --git a/testapp/exam/static/exam/css/question.css b/testapp/yaksh_app/static/yaksh_app/css/question.css
index 4bf5913..4bf5913 100644
--- a/testapp/exam/static/exam/css/question.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/question.css
diff --git a/testapp/exam/static/exam/css/question_paper_creation.css b/testapp/yaksh_app/static/yaksh_app/css/question_paper_creation.css
index c915320..c915320 100644
--- a/testapp/exam/static/exam/css/question_paper_creation.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/question_paper_creation.css
diff --git a/testapp/exam/static/exam/css/question_quiz.css b/testapp/yaksh_app/static/yaksh_app/css/question_quiz.css
index ee249d4..ee249d4 100644
--- a/testapp/exam/static/exam/css/question_quiz.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/question_quiz.css
diff --git a/testapp/exam/static/exam/css/showusers.css b/testapp/yaksh_app/static/yaksh_app/css/showusers.css
index 66a3746..66a3746 100644
--- a/testapp/exam/static/exam/css/showusers.css
+++ b/testapp/yaksh_app/static/yaksh_app/css/showusers.css
diff --git a/testapp/exam/static/exam/js/add_question.js b/testapp/yaksh_app/static/yaksh_app/js/add_question.js
index 946c139..946c139 100644
--- a/testapp/exam/static/exam/js/add_question.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/add_question.js
diff --git a/testapp/exam/static/exam/js/add_questionpaper.js b/testapp/yaksh_app/static/yaksh_app/js/add_questionpaper.js
index 6185dd5..6185dd5 100644
--- a/testapp/exam/static/exam/js/add_questionpaper.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/add_questionpaper.js
diff --git a/testapp/exam/static/exam/js/add_quiz.js b/testapp/yaksh_app/static/yaksh_app/js/add_quiz.js
index 184881c..184881c 100644
--- a/testapp/exam/static/exam/js/add_quiz.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/add_quiz.js
diff --git a/testapp/exam/static/exam/js/bootstrap-modal.js b/testapp/yaksh_app/static/yaksh_app/js/bootstrap-modal.js
index b328217..b328217 100644
--- a/testapp/exam/static/exam/js/bootstrap-modal.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/bootstrap-modal.js
diff --git a/testapp/exam/static/exam/js/bootstrap-tabs.js b/testapp/yaksh_app/static/yaksh_app/js/bootstrap-tabs.js
index a3c7ee1..a3c7ee1 100644
--- a/testapp/exam/static/exam/js/bootstrap-tabs.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/bootstrap-tabs.js
diff --git a/testapp/exam/static/exam/js/edit_question.js b/testapp/yaksh_app/static/yaksh_app/js/edit_question.js
index 7a0f56d..7a0f56d 100644
--- a/testapp/exam/static/exam/js/edit_question.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/edit_question.js
diff --git a/testapp/exam/static/exam/js/edit_quiz.js b/testapp/yaksh_app/static/yaksh_app/js/edit_quiz.js
index ce6dac7..ce6dac7 100644
--- a/testapp/exam/static/exam/js/edit_quiz.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/edit_quiz.js
diff --git a/testapp/exam/static/exam/js/min.js b/testapp/yaksh_app/static/yaksh_app/js/min.js
index b1ae21d..b1ae21d 100644
--- a/testapp/exam/static/exam/js/min.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/min.js
diff --git a/testapp/exam/static/exam/js/question.js b/testapp/yaksh_app/static/yaksh_app/js/question.js
index 75baf76..75baf76 100644
--- a/testapp/exam/static/exam/js/question.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/question.js
diff --git a/testapp/exam/static/exam/js/question_paper_creation.js b/testapp/yaksh_app/static/yaksh_app/js/question_paper_creation.js
index a144540..a144540 100644
--- a/testapp/exam/static/exam/js/question_paper_creation.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/question_paper_creation.js
diff --git a/testapp/exam/static/exam/js/show_question.js b/testapp/yaksh_app/static/yaksh_app/js/show_question.js
index e3ed1cc..e3ed1cc 100644
--- a/testapp/exam/static/exam/js/show_question.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/show_question.js
diff --git a/testapp/exam/static/exam/js/show_quiz.js b/testapp/yaksh_app/static/yaksh_app/js/show_quiz.js
index c58feaa..c58feaa 100644
--- a/testapp/exam/static/exam/js/show_quiz.js
+++ b/testapp/yaksh_app/static/yaksh_app/js/show_quiz.js
diff --git a/testapp/exam/templates/404.html b/testapp/yaksh_app/templates/404.html
index 7d33dd3..7d33dd3 100644
--- a/testapp/exam/templates/404.html
+++ b/testapp/yaksh_app/templates/404.html
diff --git a/testapp/exam/templates/500.html b/testapp/yaksh_app/templates/500.html
index d02721f..d02721f 100644
--- a/testapp/exam/templates/500.html
+++ b/testapp/yaksh_app/templates/500.html
diff --git a/testapp/exam/templates/base.html b/testapp/yaksh_app/templates/base.html
index 3dfbe10..7b91978 100644
--- a/testapp/exam/templates/base.html
+++ b/testapp/yaksh_app/templates/base.html
@@ -14,7 +14,7 @@
 	<meta name="author" content="">
    {% endblock %}
    
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/base.css" type="text/css" /> 
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" /> 
    {% block css %}
    {% endblock %}
 
diff --git a/testapp/exam/templates/manage.html b/testapp/yaksh_app/templates/manage.html
index 1db8a78..a5b4cf3 100644
--- a/testapp/exam/templates/manage.html
+++ b/testapp/yaksh_app/templates/manage.html
@@ -11,8 +11,8 @@
 <meta name="author" content="">
    {% endblock %}
    
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/base.css" type="text/css" />
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/manage.css" type="text/css" />
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" />
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/manage.css" type="text/css" />
    {% block css %}
    {% endblock %}
 
diff --git a/testapp/exam/templates/user.html b/testapp/yaksh_app/templates/user.html
index 22a9fac..db2dc9e 100644
--- a/testapp/exam/templates/user.html
+++ b/testapp/yaksh_app/templates/user.html
@@ -14,7 +14,7 @@
 	<meta name="author" content="">
    {% endblock %}
    
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/base.css" type="text/css" /> 
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" /> 
    {% block css %}
    {% endblock %}
 
diff --git a/testapp/exam/templates/exam/add_question.html b/testapp/yaksh_app/templates/yaksh_app/add_question.html
index 2e27f60..bc0fd4c 100644
--- a/testapp/exam/templates/exam/add_question.html
+++ b/testapp/yaksh_app/templates/yaksh_app/add_question.html
@@ -4,13 +4,20 @@
 {% block subtitle %}Add Question{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" />
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
 {% endblock %}
 
 {% block script %}
+<<<<<<< HEAD:testapp/exam/templates/exam/add_question.html
 <script type="text/javascript" src="{{ URL_ROOT }}/static/exam/js/jquery-1.4.2.min.js"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_question.js"></script>
+=======
+<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh_app/js/min.js"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_question.js"></script>
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/add_question.html
 {% endblock %}
 
 {% block onload %} onload='javascript:textareaformat();' {% endblock %}
diff --git a/testapp/exam/templates/exam/add_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html
index 9e02adc..44b37ba 100644
--- a/testapp/exam/templates/exam/add_questionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html
@@ -4,12 +4,18 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
 {% endblock %}
 {% block script %}
+<<<<<<< HEAD:testapp/exam/templates/exam/add_questionpaper.html
 <script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
+=======
+<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/add_quiz.html b/testapp/yaksh_app/templates/yaksh_app/add_quiz.html
index c2533de..ded8e9b 100644
--- a/testapp/exam/templates/exam/add_quiz.html
+++ b/testapp/yaksh_app/templates/yaksh_app/add_quiz.html
@@ -4,10 +4,10 @@
 {% block subtitle %}Add Quiz{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
 {% endblock %}
 {% block script %}
-<script src="{{ URL_ROOT }}/static/exam/js/add_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_quiz.js"></script>
 {% endblock %}
 {% block onload %} onload="javascript:test();"  {% endblock %}
 {% block manage %}
diff --git a/testapp/exam/templates/exam/ajax_marks.html b/testapp/yaksh_app/templates/yaksh_app/ajax_marks.html
index 716bb88..716bb88 100644
--- a/testapp/exam/templates/exam/ajax_marks.html
+++ b/testapp/yaksh_app/templates/yaksh_app/ajax_marks.html
diff --git a/testapp/exam/templates/exam/ajax_questions.html b/testapp/yaksh_app/templates/yaksh_app/ajax_questions.html
index e343f9b..e343f9b 100644
--- a/testapp/exam/templates/exam/ajax_questions.html
+++ b/testapp/yaksh_app/templates/yaksh_app/ajax_questions.html
diff --git a/testapp/exam/templates/exam/automatic_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html
index c3ffc9d..8a82fa0 100644
--- a/testapp/exam/templates/exam/automatic_questionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html
@@ -4,8 +4,8 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
 <style>
 select
 {
@@ -14,8 +14,14 @@ select
 </style>
 {% endblock %}
 {% block script %}
+<<<<<<< HEAD:testapp/exam/templates/exam/automatic_questionpaper.html
 <script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
+=======
+<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/complete.html b/testapp/yaksh_app/templates/yaksh_app/complete.html
index 08abe76..08abe76 100644
--- a/testapp/exam/templates/exam/complete.html
+++ b/testapp/yaksh_app/templates/yaksh_app/complete.html
diff --git a/testapp/exam/templates/exam/design_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html
index da38c65..4e24e09 100644
--- a/testapp/exam/templates/exam/design_questionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html
@@ -3,10 +3,10 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/base.css" type="text/css" /> 
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/question_paper_creation.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/question_paper_creation.css" />
 <style>
 select
 {
@@ -17,10 +17,10 @@ select
 {% block script %}
 <script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 
-<script src="{{ URL_ROOT }}/static/exam/js/bootstrap-tabs.js"></script>
-<script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
-<script src="{{ URL_ROOT }}/static/exam/js/question_paper_creation.js"></script>
-<script src="{{ URL_ROOT }}/static/exam/js/bootstrap-modal.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-tabs.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/question_paper_creation.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-modal.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/edit_question.html b/testapp/yaksh_app/templates/yaksh_app/edit_question.html
index 66b4f58..c95ce60 100644
--- a/testapp/exam/templates/exam/edit_question.html
+++ b/testapp/yaksh_app/templates/yaksh_app/edit_question.html
@@ -3,12 +3,18 @@
 {% block subtitle %}Edit Question{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" />
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
 {% endblock %}
 {% block script %}
+<<<<<<< HEAD:testapp/exam/templates/exam/edit_question.html
 <script src="{{ URL_ROOT }}/static/exam/js/edit_question.js"></script>
 <script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+=======
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/edit_question.js"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/edit_question.html
 {% endblock %}
 
 {% block onload %} onload = 'javascript:textareaformat();' {% endblock %}
diff --git a/testapp/exam/templates/exam/edit_quiz.html b/testapp/yaksh_app/templates/yaksh_app/edit_quiz.html
index 6445907..c8a36e7 100644
--- a/testapp/exam/templates/exam/edit_quiz.html
+++ b/testapp/yaksh_app/templates/yaksh_app/edit_quiz.html
@@ -4,11 +4,11 @@
 {% block subtitle %}Edit Quiz(zes){% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/exam/js/edit_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/edit_quiz.js"></script>
 {% endblock %}
 
 {% block onload %} onload = 'javascript:form_load();' {% endblock %}
diff --git a/testapp/exam/templates/exam/editquestionpaper.html b/testapp/yaksh_app/templates/yaksh_app/editquestionpaper.html
index 819ff06..90038b4 100644
--- a/testapp/exam/templates/exam/editquestionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/editquestionpaper.html
@@ -4,7 +4,7 @@
 {% block subtitle %}Questions in "{{ papers.quiz.description }}"{% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/exam/js/show_question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/grade_user.html b/testapp/yaksh_app/templates/yaksh_app/grade_user.html
index ae9274e..1447337 100644
--- a/testapp/exam/templates/exam/grade_user.html
+++ b/testapp/yaksh_app/templates/yaksh_app/grade_user.html
@@ -5,11 +5,11 @@
 {% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %}
  
 {% block css %}
-	 <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/gradeuser.css" type="text/css" /> 
+	 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/gradeuser.css" type="text/css" /> 
 {% endblock %}
 
 {% block script %}
-<script src= "{{ URL_ROOT }}/static/exam/js/edit_question.js"></script>
+<script src= "{{ URL_ROOT }}/static/yaksh_app/js/edit_question.js"></script>
 {% endblock %}
 {% block manage %}
 
diff --git a/testapp/exam/templates/exam/intro.html b/testapp/yaksh_app/templates/yaksh_app/intro.html
index 592937a..592937a 100644
--- a/testapp/exam/templates/exam/intro.html
+++ b/testapp/yaksh_app/templates/yaksh_app/intro.html
diff --git a/testapp/exam/templates/exam/login.html b/testapp/yaksh_app/templates/yaksh_app/login.html
index 078e7a7..341d7a7 100644
--- a/testapp/exam/templates/exam/login.html
+++ b/testapp/yaksh_app/templates/yaksh_app/login.html
@@ -4,7 +4,7 @@
 {% block pagetitle %} Online Test {% endblock %}
 {% block formtitle %}Login{% endblock %}
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/login.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/login.css" type="text/css" /> 
 {% endblock %}
 {% block content %}
 
diff --git a/testapp/exam/templates/exam/manual_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html
index e44d3cb..66c83ed 100644
--- a/testapp/exam/templates/exam/manual_questionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html
@@ -4,8 +4,8 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
 <style>
 select
 {
@@ -16,7 +16,7 @@ select
 {% block script %}
 <script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 
-<script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/monitor.html b/testapp/yaksh_app/templates/yaksh_app/monitor.html
index ecdb852..261dffd 100644
--- a/testapp/exam/templates/exam/monitor.html
+++ b/testapp/yaksh_app/templates/yaksh_app/monitor.html
@@ -5,7 +5,7 @@
 {% block meta %} <meta http-equiv="refresh" content="30"/> {% endblock meta %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
 {% endblock %}
 {% block subtitle %}
   {% if not quizzes and not quiz %}
diff --git a/testapp/exam/templates/exam/question.html b/testapp/yaksh_app/templates/yaksh_app/question.html
index e63c484..6a26527 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/yaksh_app/templates/yaksh_app/question.html
@@ -5,14 +5,21 @@
 {% block title %} Answer question {% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question.css" type="text/css" />
 
 {% endblock %}
 
 {% block script %}
+<<<<<<< HEAD:testapp/exam/templates/exam/question.html
 <script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/question.js"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/bootstrap-modal.js"></script>
+=======
+<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-modal.js"></script>
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/question.html
 
 <script>
 var time_left = {{ time_left }} 
diff --git a/testapp/exam/templates/exam/quit.html b/testapp/yaksh_app/templates/yaksh_app/quit.html
index 91bce64..91bce64 100644
--- a/testapp/exam/templates/exam/quit.html
+++ b/testapp/yaksh_app/templates/yaksh_app/quit.html
diff --git a/testapp/exam/templates/exam/quizlist.html b/testapp/yaksh_app/templates/yaksh_app/quizlist.html
index 9b1fd73..9b1fd73 100644
--- a/testapp/exam/templates/exam/quizlist.html
+++ b/testapp/yaksh_app/templates/yaksh_app/quizlist.html
diff --git a/testapp/exam/templates/exam/quizzes_user.html b/testapp/yaksh_app/templates/yaksh_app/quizzes_user.html
index 914b6b4..19618ec 100644
--- a/testapp/exam/templates/exam/quizzes_user.html
+++ b/testapp/yaksh_app/templates/yaksh_app/quizzes_user.html
@@ -4,12 +4,12 @@
 {% block subtitle %}Hello {{ user.first_name }}, welcome to your dashboard !{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/exam/js/bootstrap-alert.js"></script>
-<script src="{{ URL_ROOT }}/static/exam/js/quizzes_user.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-alert.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/quizzes_user.js"></script>
 {% endblock %}
 
 
diff --git a/testapp/exam/templates/exam/register.html b/testapp/yaksh_app/templates/yaksh_app/register.html
index 5ff79cc..5ff79cc 100644
--- a/testapp/exam/templates/exam/register.html
+++ b/testapp/yaksh_app/templates/yaksh_app/register.html
diff --git a/testapp/exam/templates/exam/results_user.html b/testapp/yaksh_app/templates/yaksh_app/results_user.html
index 2a2a309..fa8284e 100644
--- a/testapp/exam/templates/exam/results_user.html
+++ b/testapp/yaksh_app/templates/yaksh_app/results_user.html
@@ -4,7 +4,7 @@
 {% block subtitle %}Results{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/show_quiz.html b/testapp/yaksh_app/templates/yaksh_app/show_quiz.html
index cf3f552..a3c1c44 100644
--- a/testapp/exam/templates/exam/show_quiz.html
+++ b/testapp/yaksh_app/templates/yaksh_app/show_quiz.html
@@ -3,7 +3,7 @@
 {% block title %} Quiz List {% endblock title %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/exam/js/show_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_quiz.js"></script>
 {% endblock %}
 
 {% block subtitle %} Quiz List {% endblock %}
diff --git a/testapp/exam/templates/exam/showquestionpapers.html b/testapp/yaksh_app/templates/yaksh_app/showquestionpapers.html
index e511472..2a04717 100644
--- a/testapp/exam/templates/exam/showquestionpapers.html
+++ b/testapp/yaksh_app/templates/yaksh_app/showquestionpapers.html
@@ -4,7 +4,7 @@
 {% block subtitle %}List of Question Papers {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/exam/js/show_question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/showquestions.html b/testapp/yaksh_app/templates/yaksh_app/showquestions.html
index d593ab8..f0b53bc 100644
--- a/testapp/exam/templates/exam/showquestions.html
+++ b/testapp/yaksh_app/templates/yaksh_app/showquestions.html
@@ -4,9 +4,13 @@
 {% block subtitle %}List of Questions {% endblock %}
 
 {% block script %}
+<<<<<<< HEAD:testapp/exam/templates/exam/showquestions.html
 <script src="{{ URL_ROOT }}/static/exam/js/min.js"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/show_question.js"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/question_filter.js"></script>
+=======
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script>
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/showquestions.html
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/exam/templates/exam/showusers.html b/testapp/yaksh_app/templates/yaksh_app/showusers.html
index 01ecc37..7b2bb6d 100644
--- a/testapp/exam/templates/exam/showusers.html
+++ b/testapp/yaksh_app/templates/yaksh_app/showusers.html
@@ -6,7 +6,7 @@ List of Users
 {% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/showusers.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/showusers.css" type="text/css" /> 
 {% endblock css %}
 
 
diff --git a/testapp/exam/templates/exam/user_data.html b/testapp/yaksh_app/templates/yaksh_app/user_data.html
index 61a3a97..61a3a97 100644
--- a/testapp/exam/templates/exam/user_data.html
+++ b/testapp/yaksh_app/templates/yaksh_app/user_data.html
diff --git a/testapp/exam/tests.py b/testapp/yaksh_app/tests.py
index cd84874..fd6f6a9 100644
--- a/testapp/exam/tests.py
+++ b/testapp/yaksh_app/tests.py
@@ -1,5 +1,5 @@
 from django.utils import unittest
-from testapp.exam.models import User, Profile, Question, Quiz, QuestionPaper,\
+from testapp.yaksh_app.models import User, Profile, Question, Quiz, QuestionPaper,\
     QuestionSet, AnswerPaper, Answer, TestCase
 import datetime, json
 
diff --git a/testapp/exam/urls.py b/testapp/yaksh_app/urls.py
index c87df9a..d096a61 100644
--- a/testapp/exam/urls.py
+++ b/testapp/yaksh_app/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 
-urlpatterns = patterns('testapp.exam.views',
+urlpatterns = patterns('testapp.yaksh_app.views',
     url(r'^$', 'index'),
     url(r'^login/$', 'user_login'),
     url(r'^quizzes/$', 'quizlist_user'),
diff --git a/testapp/exam/views.py b/testapp/yaksh_app/views.py
index f39f3c1..6623ad5 100644
--- a/testapp/exam/views.py
+++ b/testapp/yaksh_app/views.py
@@ -16,14 +16,22 @@ from taggit.models import Tag
 from itertools import chain
 import json
 # Local imports.
+<<<<<<< HEAD:testapp/exam/views.py
 from testapp.exam.models import Quiz, Question, QuestionPaper, QuestionSet
 from testapp.exam.models import Profile, Answer, AnswerPaper, User, TestCase
 from testapp.exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\
                 QuestionForm, RandomQuestionForm, TestCaseFormSet,\
                 QuestionFilterForm
 from testapp.exam.xmlrpc_clients import code_server
+=======
+from testapp.yaksh_app.models import Quiz, Question, QuestionPaper, QuestionSet
+from testapp.yaksh_app.models import Profile, Answer, AnswerPaper, User, TestCase
+from testapp.yaksh_app.forms import UserRegisterForm, UserLoginForm, QuizForm,\
+                QuestionForm, RandomQuestionForm, TestCaseFormSet
+from testapp.yaksh_app.xmlrpc_clients import code_server
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py
 from settings import URL_ROOT
-from testapp.exam.models import AssignmentUpload
+from testapp.yaksh_app.models import AssignmentUpload
 
 # The directory where user data can be saved.
 OUTPUT_DIR = abspath(join(dirname(__file__), 'output'))
@@ -128,11 +136,11 @@ def user_register(request):
             login(request, new_user)
             return my_redirect("/exam/start/")
         else:
-            return my_render_to_response('exam/register.html', {'form': form},
+            return my_render_to_response('yaksh_app/register.html', {'form': form},
                                          context_instance=ci)
     else:
         form = UserRegisterForm()
-        return my_render_to_response('exam/register.html', {'form': form},
+        return my_render_to_response('yaksh_app/register.html', {'form': form},
                                       context_instance=ci)
 
 
@@ -152,12 +160,12 @@ def quizlist_user(request):
         context['quizzes'] = avail_quizzes
         context['user'] = user
         context['quizzes_taken'] = None
-        return my_render_to_response("exam/quizzes_user.html", context)
+        return my_render_to_response("yaksh_app/quizzes_user.html", context)
 
     context['quizzes'] = avail_quizzes
     context['user'] = user
     context['quizzes_taken'] = quizzes_taken
-    return my_render_to_response("exam/quizzes_user.html", context)
+    return my_render_to_response("yaksh_app/quizzes_user.html", context)
 
 
 def intro(request, questionpaper_id):
@@ -188,7 +196,7 @@ def intro(request, questionpaper_id):
     if already_attempted == 0:
         context = {'user': user, 'paper_id': questionpaper_id,\
                 'attempt_num': already_attempted + 1}
-        return my_render_to_response('exam/intro.html', context,
+        return my_render_to_response('yaksh_app/intro.html', context,
                                      context_instance=ci)
 
     if already_attempted == attempt_number:
@@ -216,7 +224,7 @@ def intro(request, questionpaper_id):
         if days_after_attempt >= time_lag:
             context = {'user': user, 'paper_id': questionpaper_id,\
                     'attempt_num': already_attempted + 1}
-            return my_render_to_response('exam/intro.html', context,
+            return my_render_to_response('yaksh_app/intro.html', context,
                                          context_instance=ci)
         else:
             return my_redirect("/exam/quizzes/")
@@ -251,7 +259,7 @@ def results_user(request):
                max_marks, percentage
         quiz_marks.append(temp)
     context = {'papers': quiz_marks}
-    return my_render_to_response("exam/results_user.html", context)
+    return my_render_to_response("yaksh_app/results_user.html", context)
 
 
 def edit_quiz(request):
@@ -353,14 +361,14 @@ def add_question(request, question_id=None):
                     if test_case_formset.is_valid():
                         test_case_formset.save()
                     else:
-                        return my_render_to_response('exam/add_question.html',
+                        return my_render_to_response('yaksh_app/add_question.html',
                                                      {'form': form,
                                                      'formset': test_case_formset},
                                                      context_instance=ci)
 
                     return my_redirect("/exam/manage/questions")
 
-                return my_render_to_response('exam/add_question.html',
+                return my_render_to_response('yaksh_app/add_question.html',
                                              {'form': form,
                                              'formset': test_case_formset},
                                              context_instance=ci)
@@ -394,21 +402,21 @@ def add_question(request, question_id=None):
                         for i in test_case_instance:
                             i.save()
                     else:
-                        return my_render_to_response('exam/add_question.html',
+                        return my_render_to_response('yaksh_app/add_question.html',
                                                      {'form': form,
                                                      'formset': test_case_formset},
                                                      context_instance=ci)
 
 
                     return my_redirect("/exam/manage/questions")
-                return my_render_to_response('exam/add_question.html',
+                return my_render_to_response('yaksh_app/add_question.html',
                                              {'form': form,
                                              'formset': test_case_formset},
                                              context_instance=ci)
 
         else:
             test_case_formset = add_or_delete_test_form(request.POST, form.save(commit=False))
-            return my_render_to_response('exam/add_question.html',
+            return my_render_to_response('yaksh_app/add_question.html',
                                          {'form': form,
                                          'formset': test_case_formset},
                                          context_instance=ci)
@@ -418,7 +426,7 @@ def add_question(request, question_id=None):
         if question_id is None:
             form = QuestionForm()
             test_case_formset = TestCaseFormSet(prefix='test', instance=Question())
-            return my_render_to_response('exam/add_question.html',
+            return my_render_to_response('yaksh_app/add_question.html',
                                          {'form': form,
                                          'formset': test_case_formset},
                                          context_instance=ci)
@@ -447,7 +455,7 @@ def add_question(request, question_id=None):
             test_case_formset = TestCaseFormSet(prefix='test', 
                                                     instance=d)
 
-            return my_render_to_response('exam/add_question.html',
+            return my_render_to_response('yaksh_app/add_question.html',
                                          {'form': form,
                                          'formset': test_case_formset},
                                          context_instance=ci)
@@ -484,13 +492,13 @@ def add_quiz(request, quiz_id=None):
                 quiz = Quiz.objects.get(id=quiz_id)
                 return my_redirect("/exam/manage/showquiz")
         else:
-            return my_render_to_response('exam/add_quiz.html',
+            return my_render_to_response('yaksh_app/add_quiz.html',
                                          {'form': form},
                                          context_instance=ci)
     else:
         if quiz_id is None:
             form = QuizForm()
-            return my_render_to_response('exam/add_quiz.html',
+            return my_render_to_response('yaksh_app/add_quiz.html',
                                          {'form': form},
                                          context_instance=ci)
         else:
@@ -505,7 +513,7 @@ def add_quiz(request, quiz_id=None):
             form.initial['prerequisite'] = d.prerequisite_id
             form.initial['attempts_allowed'] = d.attempts_allowed
             form.initial['time_between_attempts'] = d.time_between_attempts
-            return my_render_to_response('exam/add_quiz.html',
+            return my_render_to_response('yaksh_app/add_quiz.html',
                                          {'form': form},
                                          context_instance=ci)
 
@@ -527,19 +535,19 @@ def show_all_questionpapers(request, questionpaper_id=None):
             q_paper.questions.remove(Question.objects.get(id=i))
         question_paper = QuestionPaper.objects.all()
         context = {'papers': question_paper}
-        return my_render_to_response('exam/showquestionpapers.html', context,
+        return my_render_to_response('yaksh_app/showquestionpapers.html', context,
                                      context_instance=ci)
     if questionpaper_id is None:
         qu_papers = QuestionPaper.objects.all()
         context = {'papers': qu_papers}
-        return my_render_to_response('exam/showquestionpapers.html', context,
+        return my_render_to_response('yaksh_app/showquestionpapers.html', context,
                                      context_instance=ci)
     else:
         qu_papers = QuestionPaper.objects.get(id=questionpaper_id)
         quiz = qu_papers.quiz
         questions = qu_papers.questions.all()
         context = {'papers': {'quiz': quiz, 'questions': questions}}
-        return my_render_to_response('exam/editquestionpaper.html', context,
+        return my_render_to_response('yaksh_app/editquestionpaper.html', context,
                                      context_instance=ci)
 
 
@@ -585,12 +593,12 @@ def automatic_questionpaper(request, questionpaper_id=None):
                                     'tags': tags,
                                     'msg': msg}}
                 return my_render_to_response(
-                    'exam/automatic_questionpaper.html', context,
+                    'yaksh_app/automatic_questionpaper.html', context,
                     context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('exam/automatic_questionpaper.html',
+            return my_render_to_response('yaksh_app/automatic_questionpaper.html',
                                          context, context_instance=ci)
 
     else:
@@ -607,7 +615,7 @@ def automatic_questionpaper(request, questionpaper_id=None):
                 for quest in questions:
                     q = Question.objects.get(id=quest)
                     quest_paper.questions.add(q)
-                return my_redirect('/exam/manage/showquiz')
+                return my_redirect('/yaksh_app/manage/showquiz')
             else:
                 no_questions = int(request.POST.get('num_questions'))
                 fetched_questions = fetch_questions(request)
@@ -625,12 +633,12 @@ def automatic_questionpaper(request, questionpaper_id=None):
                                     'tags': tags,
                                     'msg': msg}}
                 return my_render_to_response(
-                    'exam/automatic_questionpaper.html', context,
+                    'yaksh_app/automatic_questionpaper.html', context,
                     context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('exam/automatic_questionpaper.html',
+            return my_render_to_response('yaksh_app/automatic_questionpaper.html',
                                          context, context_instance=ci)
 
 
@@ -666,13 +674,13 @@ def manual_questionpaper(request, questionpaper_id=None):
                 tags = Tag.objects.all()
                 context = {'data': {'questions': fetched_questions,
                                     'tags': tags, 'msg': msg}}
-                return my_render_to_response('exam/manual_questionpaper.html',
+                return my_render_to_response('yaksh_app/manual_questionpaper.html',
                                              context,
                                              context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('exam/manual_questionpaper.html',
+            return my_render_to_response('yaksh_app/manual_questionpaper.html',
                                          context, context_instance=ci)
 
     else:
@@ -699,13 +707,13 @@ def manual_questionpaper(request, questionpaper_id=None):
                 tags = Tag.objects.all()
                 context = {'data': {'questions': fetched_questions,
                                     'tags': tags, 'msg': msg}}
-                return my_render_to_response('exam/manual_questionpaper.html',
+                return my_render_to_response('yaksh_app/manual_questionpaper.html',
                                              context,
                                              context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('exam/manual_questionpaper.html',
+            return my_render_to_response('yaksh_app/manual_questionpaper.html',
                                          context, context_instance=ci)
 
 
@@ -749,12 +757,12 @@ def user_login(request):
             return my_redirect('/exam/login/')
         else:
             context = {"form": form}
-            return my_render_to_response('exam/login.html', context,
+            return my_render_to_response('yaksh_app/login.html', context,
                                          context_instance=ci)
     else:
         form = UserLoginForm()
         context = {"form": form}
-        return my_render_to_response('exam/login.html', context,
+        return my_render_to_response('yaksh_app/login.html', context,
                                      context_instance=ci)
 
 
@@ -857,7 +865,7 @@ def question(request, q_id, attempt_num, questionpaper_id, success_msg=None):
         if skipped_answer:
             context['last_attempt'] = skipped_answer[0].answer
     ci = RequestContext(request)
-    return my_render_to_response('exam/question.html', context,
+    return my_render_to_response('yaksh_app/question.html', context,
                                  context_instance=ci)
 
 
@@ -990,7 +998,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                    'to_attempt': to_attempt, 'submitted': submitted}
         ci = RequestContext(request)
 
-        return my_render_to_response('exam/question.html', context,
+        return my_render_to_response('yaksh_app/question.html', context,
                                      context_instance=ci)
     else:
         if time_left <= 0:
@@ -1008,7 +1016,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                        'to_attempt': to_attempt, 'submitted': submitted}
             ci = RequestContext(request)
 
-            return my_render_to_response('exam/question.html', context,
+            return my_render_to_response('yaksh_app/question.html', context,
                                          context_instance=ci)
         else:
             next_q = paper.completed_question(question.id)
@@ -1076,7 +1084,7 @@ def quit(request, attempt_num=None, questionpaper_id=None):
     context = {'id': questionpaper_id, 'attempt_num': attempt_num,
                  'unattempted': unattempted_questions,
                  'submitted': submitted_questions}
-    return my_render_to_response('exam/quit.html', context,
+    return my_render_to_response('yaksh_app/quit.html', context,
                                  context_instance=RequestContext(request))
 
 
@@ -1088,7 +1096,7 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None):
         logout(request)
         message = reason or "You are successfully logged out."
         context = {'message': message}
-        return my_render_to_response('exam/complete.html', context)
+        return my_render_to_response('yaksh_app/complete.html', context)
     else:
         unattempted_questions, submitted_questions = get_question_labels(request,
                                                      attempt_num, questionpaper_id)
@@ -1110,13 +1118,13 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None):
                        Thank You !",
                        'unattempted': unattempted_questions,
                        'submitted': submitted_questions}
-            return my_render_to_response('exam/complete.html', context)
+            return my_render_to_response('yaksh_app/complete.html', context)
         else:
             message = reason or "You are successfully logged out"
             context = {'message':  message,
                          'unattempted': unattempted_questions,
                          'submitted': submitted_questions}
-            return my_render_to_response('exam/complete.html', context)
+            return my_render_to_response('yaksh_app/complete.html', context)
     no = False
     message = reason or 'The quiz has been completed. Thank you.'
     if user.groups.filter(name='moderator').count() > 0:
@@ -1146,7 +1154,7 @@ def monitor(request, questionpaper_id=None):
         context = {'papers': [],
                    'quiz': None,
                    'quizzes': q_paper}
-        return my_render_to_response('exam/monitor.html', context,
+        return my_render_to_response('yaksh_app/monitor.html', context,
                                      context_instance=ci)
     # quiz_id is not None.
     try:
@@ -1159,7 +1167,7 @@ def monitor(request, questionpaper_id=None):
             total=Sum('answers__marks')).order_by('-total')
 
     context = {'papers': papers, 'quiz': q_paper, 'quizzes': None}
-    return my_render_to_response('exam/monitor.html', context,
+    return my_render_to_response('yaksh_app/monitor.html', context,
                                  context_instance=ci)
 
 
@@ -1191,7 +1199,7 @@ def show_all_users(request):
     user = User.objects.filter(username__contains="")
     questionpaper = AnswerPaper.objects.all()
     context = {'question': questionpaper}
-    return my_render_to_response('exam/showusers.html', context,
+    return my_render_to_response('yaksh_app/showusers.html', context,
                                  context_instance=RequestContext(request))
 
 
@@ -1212,7 +1220,7 @@ def show_all_quiz(request):
             context = {'papers': [],
                        'quiz': None,
                        'quizzes': quizzes}
-            return my_render_to_response('exam/show_quiz.html', context,
+            return my_render_to_response('yaksh_app/show_quiz.html', context,
                                          context_instance=ci)
         else:
             for i in data:
@@ -1221,7 +1229,7 @@ def show_all_quiz(request):
             context = {'papers': [],
                        'quiz': None,
                        'quizzes': quizzes}
-            return my_render_to_response('exam/show_quiz.html', context,
+            return my_render_to_response('yaksh_app/show_quiz.html', context,
                                          context_instance=ci)
 
     elif request.method == 'POST' and request.POST.get('edit') == 'edit':
@@ -1238,7 +1246,7 @@ def show_all_quiz(request):
             form.initial['language'] = d.language
             form.initial['prerequisite'] = d.prerequisite_id
             forms.append(form)
-        return my_render_to_response('exam/edit_quiz.html',
+        return my_render_to_response('yaksh_app/edit_quiz.html',
                                      {'forms': forms, 'data': data},
                                      context_instance=ci)
     else:
@@ -1246,7 +1254,7 @@ def show_all_quiz(request):
         context = {'papers': [],
                    'quiz': None,
                    'quizzes': quizzes}
-        return my_render_to_response('exam/show_quiz.html', context,
+        return my_render_to_response('yaksh_app/show_quiz.html', context,
                                      context_instance=ci)
 
 
@@ -1289,10 +1297,15 @@ def show_all_questions(request):
             form = QuestionFilterForm()
             context = {'papers': [],
                        'question': None,
+<<<<<<< HEAD:testapp/exam/views.py
                        'questions': questions,
                        'form': form
                        }
             return my_render_to_response('exam/showquestions.html', context,
+=======
+                       'questions': questions}
+            return my_render_to_response('yaksh_app/showquestions.html', context,
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py
                                          context_instance=ci)
         else:
             for i in data:
@@ -1301,10 +1314,15 @@ def show_all_questions(request):
             form = QuestionFilterForm()
             context = {'papers': [],
                        'question': None,
+<<<<<<< HEAD:testapp/exam/views.py
                        'questions': questions,
                        'form': form
                        }
             return my_render_to_response('exam/showquestions.html', context,
+=======
+                       'questions': questions}
+            return my_render_to_response('yaksh_app/showquestions.html', context,
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py
                                          context_instance=ci)
     elif request.method == 'POST' and request.POST.get('edit') == 'edit':
         data = request.POST.getlist('question')
@@ -1337,7 +1355,7 @@ def show_all_questions(request):
             formsets.append(test_case_formset)
             data_list = zip(forms, formsets)
 
-        return my_render_to_response('exam/edit_question.html',
+        return my_render_to_response('yaksh_app/edit_question.html',
                                      {'data': data,
                                      'data_list': data_list},
                                      context_instance=ci)
@@ -1346,10 +1364,15 @@ def show_all_questions(request):
         form = QuestionFilterForm()
         context = {'papers': [],
                    'question': None,
+<<<<<<< HEAD:testapp/exam/views.py
                    'questions': questions,
                    'form': form
                    }
         return my_render_to_response('exam/showquestions.html', context,
+=======
+                   'questions': questions}
+        return my_render_to_response('yaksh_app/showquestions.html', context,
+>>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py
                                      context_instance=ci)
 
 
@@ -1363,7 +1386,7 @@ def user_data(request, username):
     data = get_user_data(username)
 
     context = {'data': data}
-    return my_render_to_response('exam/user_data.html', context,
+    return my_render_to_response('yaksh_app/user_data.html', context,
                                  context_instance=RequestContext(request))
 
 
@@ -1390,11 +1413,11 @@ def grade_user(request, username):
             paper.save()
 
         context = {'data': data}
-        return my_render_to_response('exam/user_data.html', context,
+        return my_render_to_response('yaksh_app/user_data.html', context,
                                      context_instance=ci)
     else:
         context = {'data': data}
-        return my_render_to_response('exam/grade_user.html', context,
+        return my_render_to_response('yaksh_app/grade_user.html', context,
                                      context_instance=ci)
 
 
@@ -1407,7 +1430,7 @@ def ajax_questionpaper(request, query):
         question_type = request.POST.get('question_type')
         questions = Question.objects.filter(type=question_type)
         marks = questions.values_list('points').distinct()
-        return my_render_to_response('exam/ajax_marks.html', {'marks': marks})
+        return my_render_to_response('yaksh_app/ajax_marks.html', {'marks': marks})
     elif query == 'questions':
         question_type = request.POST['question_type']
         marks_selected = request.POST['marks']
@@ -1420,7 +1443,7 @@ def ajax_questionpaper(request, query):
                                             points=marks_selected))
         questions = [question for question in questions \
                 if not str(question.id) in question_list]
-        return my_render_to_response('exam/ajax_questions.html',
+        return my_render_to_response('yaksh_app/ajax_questions.html',
                               {'questions': questions})
 
 
@@ -1466,5 +1489,5 @@ def design_questionpaper(request):
     else:
         form = RandomQuestionForm()
         context = {'form': form}
-        return my_render_to_response('exam/design_questionpaper.html',
+        return my_render_to_response('yaksh_app/design_questionpaper.html',
                                      context, context_instance=ci)
diff --git a/testapp/exam/xmlrpc_clients.py b/testapp/yaksh_app/xmlrpc_clients.py
index 3a3c0c6..3a3c0c6 100644
--- a/testapp/exam/xmlrpc_clients.py
+++ b/testapp/yaksh_app/xmlrpc_clients.py