diff --git a/subastasIS2_django/django_simple_search/__init__.py b/subastasIS2_django/django_simple_search/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/subastasIS2_django/django_simple_search/models.py b/subastasIS2_django/django_simple_search/models.py
new file mode 100644
index 0000000..c93ebbe
--- /dev/null
+++ b/subastasIS2_django/django_simple_search/models.py
@@ -0,0 +1 @@
+# this file has been intentionally left blank
\ No newline at end of file
diff --git a/subastasIS2_django/django_simple_search/tests.py b/subastasIS2_django/django_simple_search/tests.py
new file mode 100644
index 0000000..3c82082
--- /dev/null
+++ b/subastasIS2_django/django_simple_search/tests.py
@@ -0,0 +1,117 @@
+
+from django.db import models
+from django.test import TestCase,TransactionTestCase
+from utils import *
+
+class NormalizeTest(TestCase):
+    def test_normalize(self):
+        """
+        tests to normalize the query
+        """
+        self.assertEquals(
+            normalize_query('  some random  words "with   quotes  " and   spaces'),
+            ['some', 'random', 'words', 'with quotes', 'and', 'spaces']
+        )
+
+        self.assertEquals(
+            normalize_query('  adsf add a & and a | "for good%measure"'),
+            ['adsf','add','a','&','and','a','|',"for good%measure"]
+        )
+
+    def test_empty_string(self, ):
+        """
+        """
+        self.assertEquals(normalize_query(""),[])
+
+class BuildQueryTest(TestCase):
+
+    def test_find_items_in_database(self, ):
+        """
+        test to find the items based on fields
+        """
+
+        query = build_query("now is the time",['name','description'])
+
+        self.assertEquals(len(query),4)
+
+        self.assertEquals(
+            str(query),
+            "(AND: (OR: ('name__icontains', 'now'), ('description__icontains', 'now')), (OR: ('name__icontains', 'is'), ('description__icontains', 'is')), (OR: ('name__icontains', 'the'), ('description__icontains', 'the')), (OR: ('name__icontains', 'time'), ('description__icontains', 'time')))"
+        )
+
+
+class GenericSearchTest(TransactionTestCase):
+    """
+    """
+
+    def setUp(self, ):
+
+        self.entry=Entry.objects.get_or_create(name="Now", description="is the time")[0]
+
+        Entry.objects.get_or_create(name="Item 2",description="do we have time?")
+
+        self.freds = [
+            Entry.objects.get_or_create(name="Is",description="fred flintstone")[0],
+            Entry.objects.get_or_create(name="barney rubble",description="fred's neighbor")[0],
+            ]
+
+
+    def test_generic_query(self, ):
+        """
+        """
+
+        request = MockRequest({"q":"now is the time"})
+
+        result = generic_search(request,Entry,["name","description"])
+
+        self.assertEquals(list(result),
+                    [self.entry,]
+        )
+
+    def test_multiple_records(self, ):
+        """
+        """
+        request = MockRequest({"q":"fred"})
+
+
+        result = generic_search(request,Entry,["name","description"])
+
+        self.assertEquals(list(result),
+                    self.freds
+        )
+
+    def test_empty_query_returns_all(self,):
+        """
+        """
+
+        request = MockRequest({})
+
+
+        result = generic_search(request,Entry,["name","description"])
+
+        self.assertEquals(set(result),
+                          set(Entry.objects.all())
+        )
+
+
+
+
+
+class MockRequest(object):
+
+    def __init__(self, get_params):
+        """
+        """
+        self.GET=get_params
+
+
+class Entry(models.Model):
+
+    name=models.CharField(max_length=50)
+    description=models.TextField()
+
+    def __unicode__(self, ):
+        """
+        """
+        return self.name
+
diff --git a/subastasIS2_django/django_simple_search/utils.py b/subastasIS2_django/django_simple_search/utils.py
new file mode 100644
index 0000000..fdb537f
--- /dev/null
+++ b/subastasIS2_django/django_simple_search/utils.py
@@ -0,0 +1,49 @@
+import re
+
+from django.db.models import Q
+
+def normalize_query(query_string,
+                    findterms=re.compile(r'"([^"]+)"|(\S+)').findall,
+                    normspace=re.compile(r'\s{2,}').sub):
+
+    return [normspace(' ', (t[0] or t[1]).strip()) for t in findterms(query_string)]
+
+
+def build_query(query_string, search_fields):
+    ''' Returns a query, that is a combination of Q objects. That combination
+        aims to search keywords within a model by testing the given search fields.
+
+    '''
+    query = None # Query to search for every search term
+    terms = normalize_query(query_string)
+    for term in terms:
+        or_query = None # Query to search for a given term in each field
+        for field_name in search_fields:
+            q = Q(**{"%s__icontains" % field_name: term})
+
+            if or_query:
+                or_query = or_query |q
+            else:
+                or_query = q
+
+
+        if query:
+            query = query & or_query
+        else:
+            query = or_query
+    return query
+
+def generic_search(request,model,fields,query_param="q" ):
+    """
+    """
+
+    query_string = request.GET.get(query_param,"").strip()
+
+    if not query_string:
+        return model.objects.all()
+
+    entry_query = build_query(query_string, fields)
+
+    found_entries = model.objects.filter(entry_query)
+
+    return found_entries
diff --git a/subastasIS2_django/django_simple_search/views.py b/subastasIS2_django/django_simple_search/views.py
new file mode 100644
index 0000000..60f00ef
--- /dev/null
+++ b/subastasIS2_django/django_simple_search/views.py
@@ -0,0 +1 @@
+# Create your views here.
diff --git a/subastasIS2_django/subastas/forms.py b/subastasIS2_django/subastas/forms.py
index 349e54f..cd8674c 100644
--- a/subastasIS2_django/subastas/forms.py
+++ b/subastasIS2_django/subastas/forms.py
@@ -95,6 +95,18 @@ def clean(self):
                 self._errors['confirm_password'] = [
                     "Las contraseñas deben coincidir"]
 
+        if 'username' in self.cleaned_data:
+            username = self.cleaned_data.get('username')
+            if User.objects.filter(username=username):
+                self._errors['username'] = [
+                    "Este nombre de usuario ya existe"]
+
+        if 'email' in self.cleaned_data:
+            email = self.cleaned_data.get('email')
+            if User.objects.filter(email=email):
+                self._errors['email'] = [
+                    "Este correo electrónico ya existe"]
+
         password = self.cleaned_data.get('password')
         regex = r'^(?=.*[a-zA-Z])(?=.*\d)(?=.*[-+_!@#$%^&*.,?=]).{6,}$'
         if password and not re.match(regex, password):
@@ -325,3 +337,28 @@ def clean(self):
             )
 
         return self.cleaned_data
+
+
+class UpdateAuctionUserForm(ModelForm):
+
+    description = CharField(
+        widget=Textarea,
+        max_length=140,
+        required=False,
+    )
+
+    interests = CharField(
+        widget=Textarea,
+        max_length=140,
+        required=False,
+    )
+
+    image = ImageField(
+        required=False,
+    )
+
+    class Meta:
+        model = AuctionUser
+        fields = ['description',
+                  'image',
+                  'interests']
diff --git a/subastasIS2_django/subastas/media/profiles/noImage.png b/subastasIS2_django/subastas/media/profiles/noImage.png
new file mode 100644
index 0000000..2f6e1a1
Binary files /dev/null and b/subastasIS2_django/subastas/media/profiles/noImage.png differ
diff --git a/subastasIS2_django/subastas/models.py b/subastasIS2_django/subastas/models.py
index 9d3eddf..a131649 100644
--- a/subastasIS2_django/subastas/models.py
+++ b/subastasIS2_django/subastas/models.py
@@ -21,7 +21,10 @@ class AuctionUser(models.Model):
     phone_number = models.CharField(max_length=20, blank=True)
     auction_points = models.PositiveIntegerField(default=0)
     offer_points = models.PositiveIntegerField(default=0)
-    image = models.ImageField(upload_to='profiles/', default='items/noDisponible.jpg', blank=True)
+    image = models.ImageField(upload_to='profiles/', default='profiles/noImage.png', blank=True)
+
+    description = models.TextField(blank=True)
+    interests = models.TextField(blank=True)
 
     activation_key = models.CharField(max_length=40, blank=True)
 
diff --git a/subastasIS2_django/subastas/static/css/style.css b/subastasIS2_django/subastas/static/css/style.css
index 1a1bc49..5d1c9c5 100644
--- a/subastasIS2_django/subastas/static/css/style.css
+++ b/subastasIS2_django/subastas/static/css/style.css
@@ -1,27 +1,36 @@
 html, body, div, span, h1, h2, h3, h4, h5, h6, p, img, strong, ul, li, article, footer, header, nav, section
 {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-size: 100%;
-    font: inherit;
-    vertical-align: baseline
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
 }
 
 article, footer, header, nav, section
 {
-    display: block
+  display: block;
 }
 
 body
 {
-    font:13px/1.231 sans-serif; *font-size:small
+  font:13px/1.231 sans-serif; *font-size:small;
 }
 
 html
 {
-    background:#3b3b3b;
-    overflow-y: scroll
+  background:#f4f4f4;
+  overflow: scroll;
+}
+
+html, body {
+  width: 100%;
+  height: 100%;
+  min-height: 100%;
+  height: auto !important;
+
+
 }
 
 article
@@ -31,81 +40,81 @@ article
 
 a, a:hover, a:active
 {
-    outline: none
+  outline: none;
 }
 
 ul
 {
-    margin-left: 2em
+  margin-left: 2em;
 }
 
 nav ul, nav li
 {
-    margin: 0;
-    list-style:none;
-    list-style-image: none
+  margin: 0;
+  list-style:none;
+  list-style-image: none;
 }
 
 strong
 {
-    font-weight: 700
+  font-weight: 700;
 }
 
 a:link
 {
-    -webkit-tap-highlight-color: #a7dbd8
+  -webkit-tap-highlight-color: #a7dbd8;
 }
 
 body
 {
-    font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-weight:400;
-    font-style: normal;
-    font-size:15px;
-    line-height:21px;
-    color:#424242;
-    text-shadow:#fff 0 1px 0;
+  font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-weight:400;
+  font-style: normal;
+  font-size:15px;
+  line-height:21px;
+  color:#424242;
+  text-shadow:#fff 0 1px 0;
 }
 
 h1, h2, h3, h4, h5, h6
 {
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif
 }
 
 a, a:active, a:visited
 {
-    color: #3299bb;
-    text-decoration:none
+  color: #3299bb;
+  text-decoration:none;
 }
 
 a:hover
 {
-    color: #424242;
-    text-decoration:underline
+  color: #424242;
+  text-decoration:underline;
 }
 
 td {
-    width: 300px;
+  width: 300px;
 }
 
 /* ::: Contenido :::  */
 
 .cuerpo
 {
-    background:none;
-    display:block;
-    margin:0 auto;
-    clear:both;
-    padding:0 20px;
+  background:none;
+  display:block;
+  margin:0 auto;
+  clear:both;
+  padding:0 20px;
 }
 
 .fila
 {
-    width: 100%;
-    max-width: 1800px;
-    min-width: 755px;
-    margin: 0 auto;
-    overflow: hidden
+  width: 100%;
+  max-width: 1950px;
+  min-width: 755px;
+  margin: 0 auto;
+  overflow: hidden;
 }
 
 .busqueda
@@ -114,6 +123,8 @@ td {
 	max-width: 500px;
 	margin: 15px;
 	float: left;
+  position: relative;
+  top: -10px;
 }
 
 .buscar
@@ -123,7 +134,7 @@ td {
 	padding: 5px;
 	padding-left: 15px;
 	padding-right: 15px;
-	color: #D8D8D8;
+	color: #8B8888;
 	border: 0;
 	border-radius: 20px;
 	box-shadow: 3px 3px 5px #848484;
@@ -132,185 +143,191 @@ td {
 .button
 {
 	padding: 5px;
-	border: 0;
-	border-radius: 20px;
-	background: #BCBCBC;
-	margin-bottom: -15px;
-	margin-left: 3px;
-	margin-right: 3px;
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
-    font-weight:700;
+  padding-bottom: 0;
+  position: relative;
+  top: 12px;
+  border: 0;
+  border-radius: 20px;
+  background: #BCBCBC;
+  margin-left: 3px;
+  margin-right: 3px;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  font-weight:700;
 }
 
 .button.body {
-    margin: 10px;
-    padding: 7px;
-    padding-left: 15px;
-    padding-right: 15px;
+  margin: 10px;
+  padding: 7px;
+  padding-left: 15px;
+  padding-right: 15px;
 }
 
 .button:hover {
-    background-color: rgba(64, 128, 128, 0.8);
+  background-color: rgba(64, 128, 128, 0.8);
 }
 
 .primera_columna, .segunda_columna
 {
-    margin-right: 3.8%;
-    float: left;
-    min-height: 1px;
+  margin-right: 3.8%;
+  float: left;
+  min-height: 1px;
 }
 
 .fila .primera_columna
 {
-    width: 48%
+  width: 48%
 }
 
 .fila .segunda_columna
 {
-    width: 22.05%
+  width: 22.05%
 }
 
 .ultima_columna
 {
-    margin-right: 0
+  margin-right: 0
 }
 
 .right
 {
-    float:right
+  float:right
 }
 
 .left
 {
-    float:left
+  float:left
 }
 
 img
 {
-    max-width: 100%;
-    height: auto;
+  max-width: 100%;
+  height: auto;
 }
 
 .centrado
 {
-    margin:0 auto 50px;
-    position:relative
+  margin:0 auto 50px;
+  position:relative
 }
 
 p
 {
-    margin:0 0 30px;
+  margin:0 0 30px;
 }
 
 h2
 {
-    font-size:21px;
-    font-weight:700;
-    color:#3b3b3b;
-    margin:0 0 30px;
+  font-size:21px;
+  font-weight:700;
+  color:#3b3b3b;
+  margin:0 0 30px;
 }
 
 .centrado h3
 {
-    margin:0 0 10px;
+  margin:0 0 10px;
 }
 
 /* ::: Principal :::  */
 
 body
 {
-    background:#f4f4f4;
-    height:auto
+  background:#f4f4f4;
 }
 
 a.logo_principal
 {
-    width:252px;
-    height:95px;
-    float:left;
-    background:transparent url(../../static/images/logo.png) no-repeat 0 0;
-    cursor:pointer;border:thin solid #424242;
-    border-width:0  1px 0 0;
-    text-indent:-9999px;
-    line-height:0;font-size:0;
-    text-decoration:none;
-    margin:9px 20px 9px;
-    padding:0 30px 0 30px;
+  width:252px;
+  height:95px;
+  float:left;
+  background:transparent url(../../static/images/logo.png) no-repeat 0 0;
+  cursor:pointer;border:thin solid #424242;
+  border-width:0  1px 0 0;
+  text-indent:-9999px;
+  line-height:0;font-size:0;
+  text-decoration:none;
+  margin:9px 20px 9px;
+  padding:0 30px 0 30px;
 }
 
 nav.navegacion_principal
 {
-    height:42px;
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
-    font-size:18px;
-    color:#3b3b3b;
-    text-shadow:#fff 0 1px 0;
-    line-height:35px;
-    font-weight:400;
-    border:thin solid #e9e9e9;
-    border-width:0 0 0 1px;
-    margin:20px 10px 0;
+  height:42px;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  font-size:18px;
+  color:#3b3b3b;
+  text-shadow:#fff 0 1px 0;
+  line-height:35px;
+  font-weight:400;
+  border:thin solid #e9e9e9;
+  border-width:0 0 0 1px;
+  margin:20px 20px 0;
 }
 
 nav.right
 {
-    float:right;
-    border:none;
+  float:right;
+  border:none;
 }
 
 
 nav.navegacion_principal ul li
 {
-    clear:right;
-    float:left;
-    margin:0 0 0 30px;
+  clear:right;
+  float:left;
+  margin:0 0 0 30px;
 }
 
 nav.right ul li
 {
-    clear:right;
-    float:left;
-    margin:0 0 0 10px;
+  clear:right;
+  float:left;
+  margin:0 0 0 10px;
 }
 
 nav.navegacion_principal ul li a
 {
-    text-decoration:none;
-    color:#3b3b3b;
+  text-decoration:none;
+  color:#3b3b3b;
 }
 
 nav.navegacion_principal ul li a:hover, #aitem a:hover
 {
-    color:#bcbcbc;
-    text-decoration:none
+  color:#bcbcbc;
+  text-decoration:none
 }
 
-#list {
-    margin-bottom: 20px;
+#list, .profile_list {
+  margin-bottom: 20px;
+}
+
+.profile_list li {
+  list-style:none;
+  list-style-image: none;
 }
 
 #aitem {
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
-    color: rgba(64, 128, 128, 1);
-    margin-top: 50px;
-    margin-right: 30px;
-    font-weight:700;
-    font-style: normal;
-    font-size:16px;
-    line-height:21px;
-    text-shadow:none;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  color: rgba(64, 128, 128, 1);
+  margin-top: 30px;
+  margin-right: -230px;
+  font-weight:700;
+  font-style: normal;
+  font-size:16px;
+  line-height:21px;
+  text-shadow:none;
 }
 
 #imagen_principal
 {
-    height:450px;
-    background:#f90;
-    width:100%;
-    position:relative;
-    float:left;
-    z-index:0;
-    border:thin solid #0f0f0f;
-    border-width:0 0 1px;
+  height:450px;
+  background:#f90;
+  width:100%;
+  position:relative;
+  float:left;
+  z-index:0;
+  border:thin solid #0f0f0f;
+  border-width:0 0 1px;
 }
 
 #logo {
@@ -318,76 +335,119 @@ nav.navegacion_principal ul li a:hover, #aitem a:hover
 }
 
 #content {
-    padding: 50px;
+  padding: 50px;
 }
 
 .ptos {
-    display: inline-block;
-    width: 450px;
+  display: inline-block;
+  width: 450px;
 }
 
+.points {
+  font-size: 13px;
+  float: right;
+  text-shadow: none;
+  color: #bcbcbc;
+  margin-right: 35px;
+  margin-top: 5px;
+}
+
+.recharge a:hover {
+  color: #bcbcbc;
+}
 
 /* ::: Inicio ::: */
 
 .index {
-    display: inline-block;
+  display: inline-block;
 }
 
 .index_title {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .index_description {
-    margin: 10px;
+  margin: 10px;
 }
 
 .inicio {
-    margin: 30px;
+  margin: 30px;
 }
 
 #welcome {
-    width: 80%;
-    float: left;
+  width: 80%;
+  float: left;
 }
 
 
 /* ::: Footer ::: */
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+#page-wrap {
+  margin: 0 0 80px;
+}
+
+#page-wrap:after {
+  width: 100%;
+  height: 80px;
+  display: block;
+  clear: both;
+}
 
 footer
 {
-    background:#424242;
-    width:100%;
-    clear:both;
-    display:block;
-    text-shadow:none;
-    color:#bcbcbc;
-    margin:0 auto;
-    padding:50px 0 0;
+  padding:50px 0 0;
+  height: 80px;
+  background:#424242;
+  text-align: center;
+  color:#bcbcbc;
+  text-shadow:none;
+  overflow: hidden;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  max-width: 1920px;
+  min-width: 755px;
+  margin: 0 auto;
+  margin-top: 20px;
+  overflow: hidden;
 }
 
 
 /* ::: Formularios :::  */
 
 .help {
-    font-size: 12px;
-    padding-left: 10px;
+  font-size: 13px;
+  padding-left: 10px;
+}
+
+.help a:hover {
+  color: #bcbcbc;
+}
+
+#help {
+  margin: -20px;
 }
 
 .required {
-    color: red;
+  color: red;
 }
 
 #key {
-    margin: 10px;
-    font-size: 12px;
+  margin: 10px;
+  font-size: 12px;
 }
 
 .sstext,
 #id_auction_user-postal_code,
 #id_auction_user-phone_number  {
-    width: 30%;
-    min-width: 75px;
-    max-width: 100px;
+  width: 30%;
+  min-width: 75px;
+  max-width: 100px;
 }
 
 .stext,
@@ -403,34 +463,36 @@ footer
 #id_user-confirm_password,
 #id_email
 #id_item-name {
-    width: 30%;
-    min-width: 150px;
-    max-width: 250px;
+  width: 30%;
+  min-width: 150px;
+  max-width: 250px;
 }
 
 .text,
 #id_auction_user-address,
 #id_user-last_name,
+#id_description,
+#id_interests
 {
-    width: 75%;
-    min-width: 250px;
-    max-width: 500px;
+  width: 75%;
+  min-width: 250px;
+  max-width: 500px;
 }
 
 textarea {
-    resize: none;
+  resize: none;
 }
 
 .registro {
-    margin: 50px;
+  margin: 50px;
 }
 
 .fregistro {
-    padding-left: 100px;
+  padding-left: 100px;
 }
 
 .freg {
-    padding: 6px;
+  padding: 6px;
 }
 
 .form-horizontal .control-label,
@@ -530,7 +592,9 @@ textarea {
 #id_item-description,
 #id_item-category,
 #id_auction-base_price,
-#id_offer-price
+#id_offer-price,
+#id_description,
+#id_interests
 {
   display: block;
   height: 25px;
@@ -549,12 +613,12 @@ textarea {
 }
 
 select {
-    border-radius: 7px;
-    border: 1px solid #cccccc;
-    height: 25px;
-    line-height: 1.428571429;
-    color: #555555;
-    padding: 1px 3px;
+  border-radius: 7px;
+  border: 1px solid #cccccc;
+  height: 25px;
+  line-height: 1.428571429;
+  color: #555555;
+  padding: 1px 3px;
 
 }
 
@@ -583,7 +647,10 @@ select {
 #id_item-category:focus,
 #id_item-image:focus,
 #id_auction-base_price:focus,
-#id_offer-price:focus {
+#id_offer-price:focus,
+#id_description:focus,
+#id_interests:focus,
+#id_image:focus {
   border-color: #66afe9;
   outline: 0;
   -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
@@ -612,8 +679,10 @@ textarea.form-control {
 }
 
 textarea#id_auction_user-address,
-textarea#id_item-description {
-    height: 38px;
+textarea#id_item-description,
+textarea#id_description,
+textarea#id_interests {
+  height: 38px;
 }
 
 .form-control-static {
@@ -651,7 +720,10 @@ textarea#id_item-description {
   .form-inline #id_item-category,
   .form-inline #id_item-image,
   .form-inline #id_auction-base_price,
-  .form-inline #id_offer-price
+  .form-inline #id_offer-price,
+  .form-inline #id_description,
+  .form-inline #id_interests,
+  .form-inline #id_image
   {
     display: inline-block;
   }
@@ -669,159 +741,336 @@ textarea#id_item-description {
   }
 }
 
+.radiopoints {
+  margin-left: 50px;
+  margin-right: 5px;
+}
+
+/* //////////////////////////////::: Perfil :::////////////////////////////////////*/
+
+.imguser, .formuser_pho {
+  vertical-align: middle;
+  height: 200px;
+  width: 150px;
+  max-width: 200px;
+  max-height: 150px;
+  border: solid 1px;
+  margin: 10px;
+  display: table-cell;
+}
+
+#imageuser, .formuser_pho {
+  text-align: center;
+  vertical-align: middle;
+  max-width: 150px;
+  max-height: 200px;
+}
+
+.formuser_pho {
+  float: left;
+}
+
+.listas {
+  clear: both;
+  padding-top: 30px;
+  padding-bottom: 30px;
+}
+
+.end {
+  margin-bottom: 10px;
+}
+
+.noitems {
+  margin-left: 40px;
+  width: 100%;
+  display: block;
+}
+
+#id_image {
+  display: inline-block;
+  float:left;
+  vertical-align: middle;
+}
+
+td.formuser {
+  width: 80%;
+}
+
+td.picuser {
+  width: 20%;
+}
+
+td#picuser {
+  width: 50%;
+  text-align: left;
+  border: solid 1px;
+}
+
+/* ///////////////////////////////////::: Ayuda ::://///////////////////////////////////// */
+
+.top {
+  padding-top: 15px;
+  padding-bottom: 20px;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  color: rgba(64, 128, 128, 1);
+  font-weight:700;
+  font-style: normal;
+  font-size:16px;
+  line-height:21px;
+  text-shadow:none;
+}
+
+.preg {
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  font-size:18px;
+  color:#3b3b3b;
+  text-shadow:#fff 0 1px 0;
+  font-weight: 700;
+  line-height:35px;
+}
+
+.lpreg {
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  font-size:18px;
+  color:#3b3b3b;
+  text-shadow:#fff 0 1px 0;
+  line-height:25px;
+  font-weight:400;
+  border:thin solid #e9e9e9;
+  border-width:0;
+  margin:0px 10px 20px;
+  display: block;
+}
+ul.lpreg {
+  list-style: square outside none;
+}
+
+.inputCard {
+  display: inline-block;
+  width: 29px;
+}
+
+#creditCard1, #expireMM {
+  margin-left: 10px;
+}
+
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+.cc {
+  margin-top: 35px;
+  margin-left: 45px;
+}
+
+#expiration {
+  margin-left: 30px;
+}
+
+.links {
+  display: inline-block;
+}
 
 /* ///////////////////////////////////::: Tablas ::://///////////////////////////////////// */
 
 .list {
-    height: 20px;
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  height: 20px;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
 }
 
 .list_head, .list_body {
-    width: 250px;
-    border-right: 1px solid;
-    text-align: center;
+  width: 250px;
+  border-right: 1px solid;
+  text-align: center;
 }
 
 .list_head {
-    height: 30px;
+  height: 30px;
 }
 
 .list_body {
-    font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-weight: 400;
+  font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-weight: 400;
 }
 
 .no_border {
-    border-right: none;
+  border-right: none;
 }
 
+.imageresults {
+  width: 150px;
+}
 
 /* /////////////////////////////////////::: Pujas ::://////////////////////////////////////*/
 
 .top_section {
-    display: inline-block;
-    width: 330px;
-    max-width: 330px;
-    min-width: 330px;
-    float: right;
+  display: inline-block;
+  width: 330px;
+  max-width: 330px;
+  min-width: 330px;
+  float: right;
 }
 
 
 .bid {
-    height: 30px;
-    width: 150px;
-    text-align: center;
-    font-size: 18px;
-    background-color: rgba(64, 128, 128, 0.8);
-    margin-right: 0;
+  height: 30px;
+  width: 150px;
+  text-align: center;
+  font-size: 18px;
+  background-color: rgba(64, 128, 128, 0.8);
+  margin-right: 0;
 }
 
 .bid:hover {
-    background-color: rgba(10, 65, 65, 0.8);
-    color: white;
+  background-color: rgba(10, 65, 65, 0.8);
+  color: white;
 }
 
 .bid:disabled {
-    background-color: rgba(136, 180, 180, 0.8); /*#72C7C7;*/
-    color: #424242;
+  background-color: rgba(181, 204, 204, 0.8); /*#72C7C7;*/
+  color: #AAA4A4;
 }
 
 #preowner {
-    color: black;
-    font-weight: 400;
+  color: black;
+  font-weight: 400;
 }
 
 .owner {
-    display: inline-block;
-    clear: right;
-    padding-right: 15px;
-    color: red;
-    font-weight: 700;
-    font-size: 18px;
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  display: inline-block;
+  clear: right;
+  padding-right: 15px;
+  margin-top: 15px;
+  color: red;
+  font-weight: 700;
+  font-size: 18px;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+}
+
+a.winner {
+  text-decoration: none;
+  color: red;
+}
+
+a.winner:hover{
+  text-decoration: underline;
+  color: #3299bb;
 }
 
 .imgauction {
-    vertical-align: middle;
-    height: 150px;
-    width: 150px;
-    border: solid 1px;
-    margin: 10px;
-    display: table-cell;
+  vertical-align: middle;
+  height: 150px;
+  width: 150px;
+  max-width: 150px;
+  max-height: 150px;
+  border: solid 1px;
+  margin: 10px;
+  display: table-cell;
 }
 
 #imageauction {
-    text-align: center;
-    vertical-align: middle;
+  text-align: center;
+  vertical-align: middle;
+  max-width: 150px;
+  max-height: 150px;
 }
 
 .texto {
-    display: inline-block;
-    width: 200px;
-    position: relative;
-    left: 160px;
-    top: -150px;
+  display: inline-block;
+  width: 200px;
+  position: relative;
+  left: 160px;
+  top: -150px;
+}
+
+.ptexto{
+  display: inline-block;
+  width: 700px;
+  position: relative;
+  left: 160px;
+  top: -150px;
 }
 
-.name {
-    color: rgba(64, 128, 128, 0.8);
-    font-weight: 700;
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+.name  {
+  color: rgba(64, 128, 128, 0.8);
+  font-weight: 700;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+
+}
 
+#auctions_bid, #auctions_won, #offers_won {
+  display: inline-block;
+  width: 100%;
+  padding-left: 15px;
+  margin-bottom: 5px;
+}
+
+.user_description {
+  display: inline-block;
+  width: 350px;
+  padding-left: 35px;
 }
 
 .description {
-    display: inline-block;
-    width: 350px;
-    padding-left: 15px;
+  display: inline-block;
+  width: 350px;
+  padding-left: 15px;
+}
+
+.user_category {
+  display: inline-block;
+  width: 300px;
+  padding-left: 35px;
 }
 
 .category {
-    display: inline-block;
-    width: 300px;
-    padding-left: 15px;
+  display: inline-block;
+  width: 300px;
+  padding-left: 15px;
 
 }
 
 .auctiontitle {
-    padding-top: 30px;
-    display: inline-block;
+  padding-top: 30px;
+  display: inline-block;
 }
 
 .actualbid {
-    padding-right: 15px;
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
-    font-size: 18px;
-    color: black;
+  padding-right: 15px;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  font-size: 18px;
+  color: black;
+  margin-top: 15px;
+}
+.bold {
+  font-weight: 700;
 }
- .bold {
-    font-weight: 700;
- }
 
 /* /////////////////////////////////::: Cronómetro :::///////////////////////////////////// */
 
 .crono {
-    font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
-    display: inline-block;
-    margin-right: -10px;
-  }
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+  display: inline-block;
+  margin-right: -10px;
+}
 
 .cntSeparator {
-color: #000000;
-font-size: 21px;
-margin: 10px 5px;
+  color: #000000;
+  font-size: 21px;
+  margin: 10px 5px;
 }
 .desc {
-margin: 7px 3px;
+  margin: 7px 3px;
 }
 .desc div {
-color: #000000;
-float: left;
-text-align: right;
-font-size: 16px;
-margin-right: 35px;
-width: 50px;
+  color: #000000;
+  float: left;
+  text-align: right;
+  font-size: 16px;
+  margin-right: 35px;
+  width: 50px;
 }
 
 .minseg {
@@ -831,242 +1080,255 @@ width: 50px;
 #seg {
   margin-left: -4px;
 }
+
+.msg {
+  color: red;
+  margin-right: 15px;
+  font-size: 20px;
+  font-weight: 700;
+  font-family:Rockwell, 'GeoSlb712MdBTMedium',"Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
+}
+
 /* /////////////////////////////////////::: Errores ::://///////////////////////////////// */
 
 .errorlist {
-    border: 4px;
-    border-color: red;
+  border: 4px;
+  border-color: red;
 }
 
 h2.error {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .error {
-    padding: 15px;
+  padding: 15px;
 }
 
 .ultimo {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .field_error {
-    color: red;
+  color: red;
 }
 
 .error_msg{
-    color: red;
-    margin-left: -70px;
+  color: red;
+  margin-left: -70px;
 }
 
 /* /////////////////////////////////////::: Pop-ups ::://////////////////////////////////  */
 
 .overlay {
-    background-color: rgba(0,0,0,0.6);
-    bottom: 0;
-    cursor: default;
-    left: 0;
-    opacity: 0;
-    position: fixed;
-    right: 0;
-    top: 0;
-    visibility: hidden;
-    z-index: 1;
-
-    -webkit-transition: opacity .5s;
-    -moz-transition: opacity .5s;
-    -ms-transition: opacity .5s;
-    -o-transition: opacity .5s;
-    transition: opacity .5s;
+  background-color: rgba(0,0,0,0.6);
+  bottom: 0;
+  cursor: default;
+  left: 0;
+  opacity: 0;
+  position: fixed;
+  right: 0;
+  top: 0;
+  visibility: hidden;
+  z-index: 1;
+
+  -webkit-transition: opacity .5s;
+  -moz-transition: opacity .5s;
+  -ms-transition: opacity .5s;
+  -o-transition: opacity .5s;
+  transition: opacity .5s;
 }
 
 .overlay:target {
-    visibility: visible;
-    opacity: 1;
+  visibility: visible;
+  opacity: 1;
 }
 
 .logoverlay {
-    background-color: rgba(0,0,0,0.6);
-    bottom: 0;
-    cursor: default;
-    left: 0;
-    opacity: 1;
-    position: fixed;
-    right: 0;
-    top: 0;
-    z-index: 1;
-
-    -webkit-transition: opacity .5s;
-    -moz-transition: opacity .5s;
-    -ms-transition: opacity .5s;
-    -o-transition: opacity .5s;
-    transition: opacity .5s;
+  background-color: rgba(0,0,0,0.6);
+  bottom: 0;
+  cursor: default;
+  left: 0;
+  opacity: 1;
+  position: fixed;
+  right: 0;
+  top: 0;
+  z-index: 1;
+
+  -webkit-transition: opacity .5s;
+  -moz-transition: opacity .5s;
+  -ms-transition: opacity .5s;
+  -o-transition: opacity .5s;
+  transition: opacity .5s;
 }
 
 .logoverlay:target {
-    visibility: visible;
-    opacity: 1;
+  visibility: visible;
+  opacity: 1;
 }
 
 .popup {
-    background-color: #fff;
-    border: 3px solid #fff;
-    display: inline-block;
-    left: 50%;
-    opacity: 0;
-    padding: 30px;
-    position: fixed;
-    text-align: justify;
-    top: 50%;
-    visibility: hidden;
-    z-index: 10;
-
-    -webkit-transform: translate(-50%, -50%);
-    -moz-transform: translate(-50%, -50%);
-    -ms-transform: translate(-50%, -50%);
-    -o-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
-
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    -ms-border-radius: 10px;
-    -o-border-radius: 10px;
-    border-radius: 10px;
-
-    -webkit-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    -moz-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    -ms-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    -o-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-
-    -webkit-transition: opacity .5s, top .5s;
-    -moz-transition: opacity .5s, top .5s;
-    -ms-transition: opacity .5s, top .5s;
-    -o-transition: opacity .5s, top .5s;
-    transition: opacity .5s, top .5s;
+  background-color: #fff;
+  border: 3px solid #fff;
+  display: inline-block;
+  left: 50%;
+  opacity: 0;
+  padding: 30px;
+  position: fixed;
+  text-align: justify;
+  top: 50%;
+  visibility: hidden;
+  z-index: 10;
+
+  -webkit-transform: translate(-50%, -50%);
+  -moz-transform: translate(-50%, -50%);
+  -ms-transform: translate(-50%, -50%);
+  -o-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  -ms-border-radius: 10px;
+  -o-border-radius: 10px;
+  border-radius: 10px;
+
+  -webkit-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  -moz-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  -ms-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  -o-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+
+  -webkit-transition: opacity .5s, top .5s;
+  -moz-transition: opacity .5s, top .5s;
+  -ms-transition: opacity .5s, top .5s;
+  -o-transition: opacity .5s, top .5s;
+  transition: opacity .5s, top .5s;
 }
 
 .logpopup {
-    background-color: #fff;
-    border: 3px solid #fff;
-    display: inline-block;
-    left: 50%;
-    opacity: 1;
-    padding: 15px;
-    position: fixed;
-    text-align: justify;
-    top: 50%;
-    z-index: 10;
-
-    -webkit-transform: translate(-50%, -50%);
-    -moz-transform: translate(-50%, -50%);
-    -ms-transform: translate(-50%, -50%);
-    -o-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
-
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    -ms-border-radius: 10px;
-    -o-border-radius: 10px;
-    border-radius: 10px;
-
-    -webkit-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    -moz-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    -ms-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    -o-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-    box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
-
-    -webkit-transition: opacity .5s, top .5s;
-    -moz-transition: opacity .5s, top .5s;
-    -ms-transition: opacity .5s, top .5s;
-    -o-transition: opacity .5s, top .5s;
-    transition: opacity .5s, top .5s;
+  background-color: #fff;
+  border: 3px solid #fff;
+  display: inline-block;
+  left: 50%;
+  opacity: 1;
+  padding: 15px;
+  position: fixed;
+  text-align: justify;
+  top: 50%;
+  z-index: 10;
+
+  -webkit-transform: translate(-50%, -50%);
+  -moz-transform: translate(-50%, -50%);
+  -ms-transform: translate(-50%, -50%);
+  -o-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  -ms-border-radius: 10px;
+  -o-border-radius: 10px;
+  border-radius: 10px;
+
+  -webkit-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  -moz-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  -ms-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  -o-box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+  box-shadow: 0 1px 1px 2px rgba(0, 0, 0, 0.4) inset;
+
+  -webkit-transition: opacity .5s, top .5s;
+  -moz-transition: opacity .5s, top .5s;
+  -ms-transition: opacity .5s, top .5s;
+  -o-transition: opacity .5s, top .5s;
+  transition: opacity .5s, top .5s;
 }
 
 .overlay:target+.popup {
-    top: 50%;
-    opacity: 1;
-    visibility: visible;
+  top: 50%;
+  opacity: 1;
+  visibility: visible;
 }
 
 .logoverlay:target+.logpopup {
-    top: 50%;
-    opacity: 1;
-    visibility: visible;
+  top: 50%;
+  opacity: 1;
+  visibility: visible;
 }
 
 .button.close {
-    line-height: 15px;
-    position: relative;
-    text-align: center;
-    text-decoration: none;
-    padding: 5px;
-    border: 0;
-    border-radius: 20px;
-    background: #BCBCBC;
-    margin-left: 10px;
-    margin-right: 10px;
-    margin-top: 10px;
-    width: 80px;
+  line-height: 15px;
+  position: relative;
+  text-align: center;
+  text-decoration: none;
+  padding: 5px;
+  border: 0;
+  border-radius: 20px;
+  background: #BCBCBC;
+  margin-left: 10px;
+  margin-right: 10px;
+  margin-top: 10px;
+  width: 80px;
 }
 
 .close {
-    background-color: rgba(0, 0, 0, 0.8);
-    height: 30px;
-    line-height: 30px;
-    position: fixed;
-    right: 0;
-    text-align: center;
-    text-decoration: none;
-    top: -15px;
-    width: 30px;
-    z-index: 4;
-
-    -webkit-border-radius: 15px;
-    -moz-border-radius: 15px;
-    -ms-border-radius: 15px;
-    -o-border-radius: 15px;
-    border-radius: 15px;
+  background-color: rgba(0, 0, 0, 0.8);
+  height: 30px;
+  line-height: 30px;
+  position: fixed;
+  right: 0;
+  text-align: center;
+  text-decoration: none;
+  top: -15px;
+  width: 30px;
+  z-index: 4;
+
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  -ms-border-radius: 15px;
+  -o-border-radius: 15px;
+  border-radius: 15px;
 }
 .close:before {
-    color: rgba(255, 255, 255, 0.9);
-    content: "X";
-    font-size: 22px;
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.9);
+  color: rgba(255, 255, 255, 0.9);
+  content: "X";
+  font-size: 22px;
+  text-shadow: 0 -1px rgba(0, 0, 0, 0.9);
 }
 .close:hover {
-    background-color: rgba(64, 128, 128, 0.8);
+  background-color: rgba(64, 128, 128, 0.8);
 }
 .popup p, .popup div {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 .popup label {
-    display: inline-block;
-    text-align: left;
-    width: 120px;
+  display: inline-block;
+  text-align: left;
+  width: 120px;
 }
 .popup input[type="text"], .popup input[type="password"] {
-    border: 1px solid;
-    border-color: #999 #ccc #ccc;
-    margin: 0;
-    padding: 2px;
+  border: 1px solid;
+  border-color: #999 #ccc #ccc;
+  margin: 0;
+  padding: 2px;
 
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    -ms-border-radius: 2px;
-    -o-border-radius: 2px;
-    border-radius: 2px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
 }
 .popup input[type="text"]:hover, .popup input[type="password"]:hover {
-    border-color: #555 #888 #888;
+  border-color: #555 #888 #888;
 }
 
 #tospu {
-    width: 80%;
-    height: 80%;
-    overflow: auto;
+  width: 80%;
+  height: 80%;
+  overflow: auto;
 }
 
 #tosb {
-    margin-top: 30px;
+  margin-top: 30px;
+}
+
+#boffers {
+  width: 100px;
 }
\ No newline at end of file
diff --git a/subastasIS2_django/subastas/templates/subastas/activation_email.txt b/subastasIS2_django/subastas/templates/subastas/activation_email.txt
index bae3454..4192834 100644
--- a/subastasIS2_django/subastas/templates/subastas/activation_email.txt
+++ b/subastasIS2_django/subastas/templates/subastas/activation_email.txt
@@ -1,4 +1,4 @@
 Bienvenido a El Juego de la Subasta {{ username }},
 
 Haga click en el siguiente link para activar su cuenta:
-http://localhost:8000/subastas/activation/{{ activation_key }}
\ No newline at end of file
+http://juegodelasubasta.herokuapp.com/activation/{{ activation_key }}
\ No newline at end of file
diff --git a/subastasIS2_django/subastas/templates/subastas/auction_detail.html b/subastasIS2_django/subastas/templates/subastas/auction_detail.html
index 5b756aa..00af19a 100644
--- a/subastasIS2_django/subastas/templates/subastas/auction_detail.html
+++ b/subastasIS2_django/subastas/templates/subastas/auction_detail.html
@@ -4,53 +4,86 @@
 
 {% block content %}
 {% if bid_form.errors %}
-    <a href="#" class="logoverlay" id="popups"></a>
-    <div class="logpopup">
-        <h2 class="error">¡Oops!</h2>
+<a href="#" class="logoverlay" id="popups"></a>
+<div class="logpopup">
+    <h2 class="error">¡Oops!</h2>
     {% if recharge %}
-        <p>No tienes suficientes puntos de subasta para pujar por este producto. Antes de continuar debes recargar tus puntos.</p>
-        <a class="close" href="{% url 'auction_detail' auction.pk %}"></a>
-        <a href="{% url 'index' %}"><input type="button" class="button close" value="Recargar" />
+    <p>No tienes suficientes puntos de subasta para pujar por este producto. Antes de continuar debes recargar tus puntos.</p>
+    <a class="close" href="{% url 'auction_detail' auction.pk %}"></a>
+    <a href="{% url 'recharge' %}"><input type="button" class="button close" value="Recargar" />
     {% else %}
-        <p>{{ error }}</p>
-        <a class="close" href="{% url 'auction_detail' auction.pk %}"></a>
-        <a href="{% url 'auction_detail' auction.pk %}"><input type="button" class="button close" value="Cerrar" /></a>
+    <p>{{ error }}</p>
+    <a class="close" href="{% url 'auction_detail' auction.pk %}"></a>
+    <a href="{% url 'auction_detail' auction.pk %}"><input type="button" class="button close" value="Cerrar" /></a>
     {% endif %}
-    </div>
+</div>
 {% endif %}
 
-<div class="fila">
-    <div>
-        <span class="right crono">
-            <div id="counter"></div>
-            <div class="desc">
-                <div>Días</div>
-                <div>Horas</div>
-                <div class="minseg">Min</div>
-                <div class="minseg" id="seg">Seg</div>
-            </div>
-        </span>
-    </div>
+<div id="time_ended" style="display: none;">
+<a href="#" class="logoverlay" id="popups"></a>
+<div class="logpopup">
+    <h2 class="error">Lo sentimos</h2>
+    <p>La subasta ha acabado. El usuario ganador ha sido <span id="awinner"></span> con <span id="abids"></span> pujas.</p>
+    <a class="close" href="{% url 'index' %}"></a>
+    <a href="{% url 'auctions' %}"><input type="button" class="button close" id="boffers" value="Más subastas" /></a>
+    <a href="{% url 'index' %}"><input type="button" class="button close" value="Cerrar" /></a>
 </div>
-<div class="fila">
-    <div class="top_section">
-    <form method="post" action="{% url 'auction_detail' auction.pk %}">
-        <input class="ultima_columna right bid button body" type="submit" value="PUJAR" />
-        <span class="ultima_columna right owner"><span id="preowner">Dueño actual: </span>{{ auction.winner.user.username }}</span>
-        {% csrf_token %}
-    </form>
+</div>
+
+<span id="cronoshow">
+    <div class="fila">
+        <div>
+            <span class="right crono">
+                <div id="counter"></div>
+                <div class="desc">
+                    <div>Días</div>
+                    <div>Horas</div>
+                    <div class="minseg">Min</div>
+                    <div class="minseg" id="seg">Seg</div>
+                </div>
+            </span>
+        </div>
+    </div>
+    <div class="fila">
+        <div class="top_section">
+            <form method="post" action="{% url 'auction_detail' auction.pk %}">
+                <input class="ultima_columna right bid button body" type="submit" value="PUJAR" />
+                <span class="ultima_columna right owner"><span id="preowner">Dueño actual: </span><span><a class="winner" href="{% url 'profile' auction.winner.user.pk %}">{{ auction.item.owner.user.username }}</a></span></span>
+                {% csrf_token %}
+            </form>
+        </div>
+        <h2 class="auctiontitle">{{ auction.item.name }}</h2>
     </div>
+</span>
+
+<span id="cronohide" style="display: none;">
+    <div class="fila">
+        <div>
+            <span class="right msg">Esta subasta ha finalizado</span>
+            <span class="ultima_columna right owner"><span id="preowner">Ganador: </span><span><a class="winner" href="{% url 'profile' auction.winner.user.pk %}">{{ auction.item.owner.user.username }}</a></span></span>
+            <span class="ultima columna right actualbid">Pujas: <span id="bids" class="bold">X pujas</span></span>
+        </div>
+    </div>
+    <div class="fila">
+        <div class="top_section">
+            <form method="post" action="{% url 'auction_detail' auction.pk %}">
+                <input class="ultima_columna right bid button body" type="submit" value="PUJAR" disabled />
+                {% csrf_token %}
+            </form>
+        </div>
     <h2 class="auctiontitle">{{ auction.item.name }}</h2>
-</div>
+    </div>
+</span>
+
 <div class="fila">
-	<span class="imgauction"><a href="{{ auction.item.image.url }}"><img id="imageauction" src="{{ auction.item.image.url }}"/></a></span>
-	<div class="texto">
-		<p class="description"><span class="name">Descripción: </span>{{ auction.item.description }}</p>
-		<p class="category"><span class="name">Categoría: </span>{{ auction.item.category }}</p>
-	</div>
+    <a href="{{ auction.item.image.url }}"><img class="imgauction" id="imageauction" src="{{ auction.item.image.url }}"/></a>
+    <div class="texto">
+      <p class="description"><span class="name">Descripción: </span>{{ auction.item.description }}</p>
+      <p class="category"><span class="name">Categoría: </span>{{ auction.item.category }}</p>
+    </div>
 </div>
 
-<script>
+  <script>
     function get_time_difference(earlierDate, laterDate){
         var nTotalDiff = laterDate.getTime() - earlierDate.getTime();
         var oDiff = new Object();
@@ -69,9 +102,9 @@ <h2 class="auctiontitle">{{ auction.item.name }}</h2>
 
     }
 
-    function use_time_difference(){
-        finish = new Date({{ auction.end_date.year }}, {{ auction.end_date.month }}, {{ auction.end_date.day }}, {{ auction.end_date.hour }}, {{ auction.end_date.minute }}, {{ auction.end_date.second }});
-        dateCurrent = new Date({{ now.year }}, {{ now.month }}, {{ now.day }}, {{ now.hour }}, {{ now.minute }}, {{ now.second }});
+    function use_time_difference(end_date, now){
+        finish = new Date(end_date.year, end_date.month, end_date.day, end_date.hour, end_date.minute, end_date.second);
+        dateCurrent = new Date(now.year, now.month, now.day, now.hour, now.minute, now.second)
         if (finish > dateCurrent){
             oDiff = get_time_difference(dateCurrent, finish);
         }
@@ -85,17 +118,83 @@ <h2 class="auctiontitle">{{ auction.item.name }}</h2>
         time = days + ":" + hours + ":" + minutes + ":" + seconds;
     }
 
-    use_time_difference();
-    {% load static %}
-    $('#counter').countdown({
-        stepTime: 60,
-        format: 'dd:hh:mm:ss',
-        startTime: time,
-        digitImages: 6,
-        digitWidth: 30,
-        digitHeight: 43,
-        image: "{% static 'images/digits2.png' %}"
-    });
+
+    var startCounter = function( end_date, now ) {
+        use_time_difference(end_date, now);
+        {% load static %}
+        $('#counter').countdown({
+            stepTime: 60,
+            format: 'dd:hh:mm:ss',
+            startTime: time,
+            digitImages: 6,
+            digitWidth: 30,
+            digitHeight: 43,
+            image: "{% static 'images/digits2.png' %}",
+            timerEnd: ended,
+        });
+    }
+
+    var restartCounter = function(end_date, now) {
+        $('#counter').html('');
+        startCounter(end_date, now);
+    }
+
+    var end_date = {
+        "year": {{ auction.end_date.year }},
+        "month": {{ auction.end_date.month }},
+        "day": {{ auction.end_date.day }},
+        "hour": {{ auction.end_date.hour }},
+        "minute": {{ auction.end_date.minute }},
+        "second": {{ auction.end_date.second }},
+    }
+
+    var now = {
+        "year": {{ now.year }},
+        "month": {{ now.month }},
+        "day": {{ now.day }},
+        "hour": {{ now.hour }},
+        "minute": {{ now.minute }},
+        "second": {{ now.second }},
+    }
+
+    var winner = "{{ auction.winner.user.username }}";
+    var bids = 0;
+
+    startCounter(end_date, now);
+    var update = function(){
+        $.getJSON("{% url 'poll_auction' %}", { "pk": "{{ auction.pk }}" }, function(a) {
+            winner = a.winner;
+            bids = a.bids;
+            $(".winner").html(a.winner);
+            $("#bids").html(a.bids);
+
+            time_change = false;
+            for (var k in a.end_date) {
+                if (a.end_date.hasOwnProperty(k)){
+                    if (a.end_date[k] != end_date[k]) {
+                        time_change = true;
+                    }
+                }
+            }
+
+            if (time_change) {
+                end_date = a.end_date;
+                now = a.now;
+                restartCounter(end_date, now);
+            }
+        });
+    }
+
+    setInterval(update, 1000);
+
+    function ended(){
+        $('#cronoshow').hide();
+        $('#cronohide').show();
+        $('#awinner').html(winner);
+        $('#abids').html(bids);
+        $('#time_ended').show();
+    }
+
 </script>
 
 {% endblock %}
diff --git a/subastasIS2_django/subastas/templates/subastas/auctions.html b/subastasIS2_django/subastas/templates/subastas/auctions.html
index 1783666..c55687e 100644
--- a/subastasIS2_django/subastas/templates/subastas/auctions.html
+++ b/subastasIS2_django/subastas/templates/subastas/auctions.html
@@ -11,16 +11,14 @@ <h2>Últimas subastas</h2>
     <thead>
         <tr class="list">
             <th class="list_head">Nombre del producto</th>
-            <th class="list_head">Dueño del producto</th>
-            <th class="list_head">Puja actual</th>
+            <th class="list_head">Máximo pujador actual</th>
             <th class="list_head no_border">Fin de subasta</th>
         </tr>
     </thead>
   {% for auction in auction_list %}
         <tr class="list">
             <td class="list_body"><a href="{% url 'auction_detail' auction.pk %}">{{ auction.item.name }}</a></td>
-            <td class="list_body">{{ auction.item.owner.user.username }}</td>
-            <td class="list_body">{{ auction.current_price }}</td>
+            <td class="list_body"><a class="winner" href="{% url 'profile' auction.winner.user.pk %}">{{ auction.winner.user.username }}</a></td>
             <td class="list_body no_border">{{ auction.end_date }}</td>
         </tr>
   {% endfor %}
diff --git a/subastasIS2_django/subastas/templates/subastas/base.html b/subastasIS2_django/subastas/templates/subastas/base.html
index 7336fa6..ff7673c 100644
--- a/subastasIS2_django/subastas/templates/subastas/base.html
+++ b/subastasIS2_django/subastas/templates/subastas/base.html
@@ -6,26 +6,27 @@
     <link rel="stylesheet" type="text/css" href="{% static 'css/style.css' %}">
     <script type="text/javascript" src="{% static 'js/jquery-2.0.3.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/jquery.countdown.js' %}"></script>
+
     <title>{% block title %}JDLS{% endblock %}</title>
 </head>
 
 <body>
+<div id="page-wrap">
     <header>
         <!-- PRIMERA FILA -->
         <div class="fila">
 
             <!-- CUADRO DE BÚSQUEDA -->
-            <form class="busqueda primera_columna">
+            <form class="busqueda primera_columna" action="{% url 'search' %}" method="get">
                 <input type="text" name="searchField" class="buscar" placeholder="Escriba lo que desee buscar..." />
-                <input type="image" name="searchButton" class="button" value="" src="{% static 'images/find.png' %}" />
+                <button type="submit" name="searchButton" class="button" value=""><image src="{% static 'images/find.png' %}"></image></button>
             </form>
 
             <!-- REGISTRO/LOGIN -->
             {% if user.is_authenticated %}
             <nav class="navegacion_principal tercera_columna right">
                 <ul>
-                    <li><a href="{% url 'test' %}">{{ user.image }}</a></li>
-                    <li><a href="{% url 'test' %}">{{ user.username }}</a></li>
+                    <li><a href="{% url 'profile' user.pk %}">{{ user.username }}</a></li>
                     <li>&bull;</li>
                     <li><a href="{% url 'logout' %}">Logout</a></li>
                 </ul>
@@ -45,6 +46,11 @@
         <!-- SEGUNDA FILA -->
         <div class="fila cuerpo" id="logo">
             <a href='{% url 'index' %}' class="logo_principal primera_columna">JDLS</a>
+            {% if user.is_authenticated %}
+            <span class="points ultima_columna right">PO: {{ user.auctionuser.offer_points }}</span>
+            <span class="points ultima_columna right">PS: {{ user.auctionuser.auction_points }}</span>
+            <span class="points recharge ultima_columna right"><a href="{% url 'recharge' %}">Recargar PS</a></span><br />
+            {% endif %}
             {% if perms.subastas.can_create_item %}<span class="ultima_columna right" id="aitem"><a href="{% url 'item' %}">Dar de alta un producto</a></span>{% endif %}
         </div>
 
@@ -53,11 +59,18 @@
     <section class="cuerpo" id="content">
         {% block content %}{% endblock %}
     </section>
-
-    <footer>
+</div>
+    <footer id="footer">
         <div class="cuerpo">
             <p>Copyright 2013 Ingeniería del Software II, Facultad de Informática, UPM</p>
         </div>
+    <div class="help" id="help">
+        <ul>
+            <li class="links"><a href="{% url 'help' %}">Ayuda </a></li>
+            <li class="links">&bull;</li>
+            <li class="links"><a href="mailto:juegodelasubasta@gmail.com?subject=Contacto%20JDLS"> Contacto</a></li>
+        </ul>
+    </div>
     </footer>
 </body>
 </html>
diff --git a/subastasIS2_django/subastas/templates/subastas/help.html b/subastasIS2_django/subastas/templates/subastas/help.html
new file mode 100644
index 0000000..d3b969e
--- /dev/null
+++ b/subastasIS2_django/subastas/templates/subastas/help.html
@@ -0,0 +1,68 @@
+{% extends "subastas/base.html" %}
+
+{% block title %}JDLS|Ayuda{% endblock %}
+
+{% block content %}
+<a name="top"></a>
+<div class="index">
+    <header>
+        <h2 class="index_title">F.A.Q.</h2>
+        <p class="index_description">En esta página encontrarás respuesta a las preguntas más frecuentes que podrías plantearte al usar El Juego de la Subasta.</p>
+    </header>
+    <article>
+        <nav class="lpreg">
+            <ul>
+                <li><a href="#preg1">¿Qué es El Juego de la Subasta?</a></li>
+                <li><a href="#preg2">¿En qué consiste El Juego de la Subasta?</a></li>
+                <li><a href="#preg3">¿Cómo me registro?</a></li>
+                <li><a href="#preg4">¿Cómo verifico mi cuenta?</a></li>
+                <li><a href="#preg5">¿Puedo poner objetos a subastar?</a></li>
+                <li><a href="#preg6">¿Puedo crear ofertas?</a></li>
+                <li><a href="#preg7">¿Qué son los puntos?</a></li>
+                <li><a href="#preg8">¿Cómo consigo puntos?</a></li>
+            </ul>
+        </nav>
+    </article>
+    <article><a name="preg1"></a>
+        <p class="preg">¿Qué es El Juego de la Subasta?</p>
+        <p>El Juego de la Subasta es un portal de adquisición de productos a través de la red. Usando nuestro sistema de puntos podrás participar en subastas y conseguir productos con las mejores ofertas.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg2"></a>
+        <p class="preg">¿En qué consiste El Juego de la Subasta?</p>
+        <p>El Juego de la Subasta consiste en lo siguiente: o bien el adminsitrador o una serie de usuarios con permisos especiales pondrán objetos a subastar o con ofertas para que se compren. Gracias a los puntos de subasta podrás pujar en las mismas y ser el ganador de estos objetos. Además, con los puntos de oferta que obtengas podrás comprar los productos ofertados.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg3"></a>
+        <p class="preg">¿Cómo me registro?</p>
+        <p>En la parte superior derecha de la web podrás encontrar el enlace que te lleva a la página de registro. Allí, introduce tus datos y se te enviará un correo para que confirmes tu cuenta. Cuando lo hagas, ya tendrás cuenta en El Juego de la Subasta.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg4"></a>
+        <p class="preg">¿Cómo verifico mi cuenta?</p>
+        <p>Una vez te registres se enviará al correo que hayas facilitado durante el mismo un enlace para que entres y te identifiques en el sistema. Una vez hecho esto tu cuenta ya estará activa y podrás empezar a participar en El Juego de la Subasta.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg5"></a>
+        <p class="preg">¿Puedo poner objetos a subastar?</p>
+        <p>Tanto para poder subtastar objetos como para crear ofertas debes tener una cuenta de usuario con permisos especiales. Ese tipo de usuarios se denominan usuarios internos.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg6"></a>
+        <p class="preg">¿Puedo crear ofertas?</p>
+        <p>Tanto para poder subtastar objetos como para crear ofertas debes tener una cuenta de usuario con permisos especiales. Ese tipo de usuarios se denominan usuarios internos.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg7"></a>
+        <p class="preg">¿Qué son los puntos?</p>
+        <p>Los puntos son el sistema de pago de El Juego de la Subasta. Hay dos tipos de puntos: de subasta (PS) y de oferta (PO). Como su propio nombre indica, los puntos de subasta se usan para obtener productos en subastas y los puntos de oferta para comprar productos en oferta.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+    <article><a name="preg8"></a>
+        <p class="preg">¿Cómo consigo puntos?</p>
+        <p>Los puntos de subasta (PS) tienes que comprarlos mientras que los de oferta (PO) sólo los obtendrás mediante tu participación en subastas. Por cada vez que pujes por un producto obtendrás un punto de oferta (y perderás uno de subasta). Para comprar puntos de subasta entra en la página de recarga de puntos que encontrarás o bien en tu perfil de usuario o bien a través del link situado en el banner superior de la web.</p>
+        <p class="top"><a href="#top">Volver arriba</a></p>
+    </article>
+</div>
+
+{% endblock %}
diff --git a/subastasIS2_django/subastas/templates/subastas/offer_detail.html b/subastasIS2_django/subastas/templates/subastas/offer_detail.html
index fc955cf..68c40a2 100644
--- a/subastasIS2_django/subastas/templates/subastas/offer_detail.html
+++ b/subastasIS2_django/subastas/templates/subastas/offer_detail.html
@@ -3,6 +3,30 @@
 {% block title %}JDLS|Oferta {% endblock %}
 
 {% block content %}
+
+<div id="sold" style="display: none;">
+<a href="#" class="logoverlay" id="popups"></a>
+<div class="logpopup">
+    <h2 class="error">Lo sentimos</h2>
+    <p>El producto ya ha sido adquirido.</p>
+    <a class="close" href="{% url 'index' %}"></a>
+    <a href="{% url 'offers' %}"><input type="button" class="button close" id="boffers" value="Más ofertas" /></a>
+    <a href="{% url 'index' %}"><input type="button" class="button close" value="Cerrar" /></a>
+</div>
+</div>
+
+<div id="offer_ended" style="display: none;">
+<a href="#" class="logoverlay" id="popups"></a>
+<div class="logpopup">
+    <h2 class="error">Lo sentimos</h2>
+    <p>Esta oferta ha expirado.</p>
+    <a class="close" href="{% url 'index' %}"></a>
+    <a href="{% url 'offers' %}"><input type="button" class="button close" id="boffers" value="Más ofertas" /></a>
+    <a href="{% url 'index' %}"><input type="button" class="button close" value="Cerrar" /></a>
+</div>
+</div>
+
+
 {% if valid %}
 <a href="#" class="logoverlay" id="popups"></a>
 <div class="logpopup">
@@ -29,6 +53,27 @@ <h2 class="error">¡Oops!</h2>
     </div>
 {% endif %}
 
+{% if offer.sold %}
+<span id="offersold">
+    <div class="fila">
+        <div>
+            <span class="right msg">Este producto ha sido comprado por {{ offer.winner }}</span>
+        </div>
+    </div>
+    <div class="fila">
+        <div class="top_section">
+            <form method="post" action="{% url 'offer_detail' offer.pk %}">
+                <input class="ultima_columna right bid button body" type="submit" value="COMPRAR" disabled />
+                <span class="ultima_columna right owner"><span id="preowner">Dueño: </span><a class="winner" href="{% url 'profile' offer.item.owner.user.pk %}">{{ offer.item.owner.user.username }}</a></span><span class="ultima columna right actualbid">Precio: <span class="bold">{{ offer.price }}</span></span>
+                {% csrf_token %}
+            </form>
+        </div>
+        <h2 class="auctiontitle">{{ offer.item.name }}</h2>
+    </div>
+</span>
+{% else %}
+
+<span id="offercronoshow">
 <div class="fila">
     <div>
         <span class="right crono">
@@ -46,14 +91,35 @@ <h2 class="error">¡Oops!</h2>
     <div class="top_section">
     <form method="post" action="{% url 'offer_detail' offer.pk %}">
         <input class="ultima_columna right bid button body" type="submit" value="COMPRAR" />
-        <span class="ultima_columna right owner"><span id="preowner">Dueño: </span>{{ offer.item.owner.user.username }}</span><span class="ultima columna right actualbid">Precio: <span class="bold">{{ offer.price }}</span></span>
-        {% csrf_token %}
-    </form>
+        <span class="ultima_columna right owner"><span id="preowner">Dueño: </span><a  class="winner" href="{% url 'profile' offer.item.owner.user.pk %}">{{ offer.item.owner.user.username }}</a></span><span class="ultima columna right actualbid">Precio: <span class="bold">{{ offer.price }}</span></span>
+            {% csrf_token %}
+        </form>
     </div>
     <h2 class="auctiontitle">{{ offer.item.name }}</h2>
 </div>
+</span>
+{% endif %}
+
+<span id="offercronohide" style="display: none;">
+    <div class="fila">
+        <div>
+            <span class="right msg">Esta oferta ha expirado</span>
+        </div>
+    </div>
+    <div class="fila">
+        <div class="top_section">
+            <form method="post" action="{% url 'offer_detail' offer.pk %}">
+                <input class="ultima_columna right bid button body" type="submit" value="COMPRAR" disabled />
+                <span class="ultima_columna right owner"><span id="preowner">Dueño: </span><a  class="winner" href="{% url 'profile' offer.item.owner.user.pk %}">{{ offer.item.owner.user.username }}</a></span><span class="ultima columna right actualbid">Precio: <span class="bold">{{ offer.price }}</span></span>
+                {% csrf_token %}
+            </form>
+        </div>
+        <h2 class="auctiontitle">{{ offer.item.name }}</h2>
+    </div>
+</span>
+
 <div class="fila">
-	<span class="imgauction"><a href="{{ offer.item.image.url }}"><img id="imageauction" src="{{ offer.item.image.url }}"/></a></span>
+	<a href="{{ offer.item.image.url }}"><img class="imgauction" id="imageauction" src="{{ offer.item.image.url }}"/></a>
 	<div class="texto">
 		<p class="description"><span class="name">Descripción: </span>{{ offer.item.description }}</p>
 		<p class="category"><span class="name">Categoría: </span>{{ offer.item.category }}</p>
@@ -95,6 +161,18 @@ <h2 class="auctiontitle">{{ offer.item.name }}</h2>
         time = days + ":" + hours + ":" + minutes + ":" + seconds;
     }
 
+    function ended(){
+        {% if offer.sold %}
+            $('#offersold').show();
+            $('#offercronohide').hide();
+        {% else %}
+            $('#offersold').hide();
+            $('#offercronohide').show();
+        {% endif %}
+        $('#offercronoshow').hide();
+        $('#offer_ended').show();
+    }
+
     use_time_difference();
     {% load static %}
     $('#counter').countdown({
@@ -104,8 +182,26 @@ <h2 class="auctiontitle">{{ offer.item.name }}</h2>
         digitImages: 6,
         digitWidth: 30,
         digitHeight: 43,
-        image: "{% static 'images/digits2.png' %}"
+        image: "{% static 'images/digits2.png' %}",
+        timerEnd: ended
     });
+
+    run_once = true;
+    var update = function(){
+        $.getJSON("{% url 'poll_offer' %}", { "pk": "{{ offer.pk }}" }, function(a) {
+            if (run_once){
+                if (a.sold == 'true') {
+                    $("#sold").show();
+                    run_once = false;
+                }
+            }
+        });
+    }
+
+    {% if not offer.sold %}
+    setInterval(update, 1000);
+    {% endif %}
+
 </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/subastasIS2_django/subastas/templates/subastas/offers.html b/subastasIS2_django/subastas/templates/subastas/offers.html
index 1584ac5..d71d7bf 100644
--- a/subastasIS2_django/subastas/templates/subastas/offers.html
+++ b/subastasIS2_django/subastas/templates/subastas/offers.html
@@ -20,7 +20,7 @@ <h2>Últimas ofertas</h2>
   {% for offer in offer_list %}
     	<tr class="list">
     		<td class="list_body"><a href="{% url 'offer_detail' offer.pk %}">{{ offer.item.name }}</a></td>
-    		<td class="list_body">{{ offer.item.owner.user.username }}</td>
+    		<td class="list_body"><a class="winner" href="{% url 'profile' offer.item.owner.user.pk %}">{{ offer.item.owner.user.username }}</a></td>
     		<td class="list_body">{{ offer.price }}</td>
     		<td class="list_body no_border">{{ offer.end_date }}</td>
     	</tr>
diff --git a/subastasIS2_django/subastas/templates/subastas/profile.html b/subastasIS2_django/subastas/templates/subastas/profile.html
new file mode 100644
index 0000000..edb22df
--- /dev/null
+++ b/subastasIS2_django/subastas/templates/subastas/profile.html
@@ -0,0 +1,78 @@
+{% extends "subastas/base.html" %}
+
+{% block title %}JDLS|Perfil {% endblock %}
+
+{% block content %}
+
+<header>
+    <h2>Perfil de {{ auction_user.user.username }}</h2>
+</header>
+
+{% if auction_user.user != user %}
+<div class="fila">
+<form method="post" action="{% url 'profile' user.pk %}">
+    <a href="{{ auction_user.image.url }}"><img class="imguser" id="imageuser" src="{{ auction_user.image.url }}"/></a>
+    <div class="ptexto">
+        <p class="user_description"><span class="name">Descripción personal: </span>{{ auction_user.description }}</p>
+        <p class="user_category"><span class="name">Intereses: </span>{{ auction_user.interests }}</p>
+    </div>
+{% else %}
+<form enctype="multipart/form-data" class="form-horizontal" method="post" action="{% url 'profile' user.pk %}">
+    {% csrf_token %}
+    <table>
+        <tr><div class="form-group">
+            <td><label class="freg control-label name">Descripción personal: </label></td>
+            <td  colspan="2" class="formuser">{{ edit_form.description }}</td>
+        </div></tr>
+        <tr><div class="form-group">
+            <td><label class="freg control-label name">Foto de perfil: </label></td>
+            <td class="picuser"><a href="{{ auction_user.image.url }}"><img class="formuser_pho" src="{{ auction_user.image.url }}"/></a><td id="pickphoto">{{ edit_form.image }}</td></td>
+        </div></tr>
+        <tr><div class="form-group">
+            <td><label class="freg control-label name">Intereses: </label></td>
+            <td colspan="2" class="formuser">{{ edit_form.interests }}</td>
+        </div></tr>
+    </table>
+    <input class="button body end" type="submit" value="Guardar" />
+{% endif %}
+
+    <div class="listas">
+        <p class="description" id="auctions_bid"><span class="name">Subastas en las que ha participado: </span>
+        {% if auctions_bid %}
+        <ul class="profile_list">
+        {% for auction in auctions_bid %}
+            <li>{{ auction.item.name }}</li>
+        {% endfor %}
+        </ul>
+        {% else %}
+        	<p class="noitems">El usuario no ha participado en subastas</p>
+        {% endif %}
+
+        <p class="description" id="auctions_won"><span class="name">Productos ganados en subastas: </span>
+        {% if auctions_bid %}
+        <ul class="profile_list">
+        {% for auction in auctions_won %}
+            <li><a href="{% url 'auction_detail' auction.pk %}">{{ auction.item.name }}</a></li>
+        {% endfor %}
+        </ul>
+        {% else %}
+        	<p class="noitems">El usuario no ha ganado ningún producto en una subasta</p>
+        {% endif %}
+
+        <p class="description" id="offers_won"><span class="name">Productos adquiridos por puntos acumulados: </span>
+        {% if offers_won %}
+        <ul class="profile_list">
+        {% for offer in offers_won %}
+            <li><a href="{% url 'offer_detail' offer.pk %}">{{ offer.item.name }}</a></li>
+        {% endfor %}
+        </ul>
+        {% else %}
+        	<p class="noitems">El usuario no ha adquirido ningún producto por puntos acumulados</p>
+        {% endif %}
+    </div>
+    {% csrf_token %}
+</form>
+</div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/subastasIS2_django/subastas/templates/subastas/recharge.html b/subastasIS2_django/subastas/templates/subastas/recharge.html
new file mode 100644
index 0000000..919e641
--- /dev/null
+++ b/subastasIS2_django/subastas/templates/subastas/recharge.html
@@ -0,0 +1,96 @@
+{% extends "subastas/base.html" %}
+
+{% block title %}JDLS|Recarga {% endblock %}
+
+{% block content %}
+<script type="text/javascript">
+    <!--
+    var downStrokeField;
+    function autojump(fieldName,nextFieldName,fakeMaxLength)
+    {
+    var myForm=document.forms[document.forms.length - 1];
+    var myField=myForm.elements[fieldName];
+    myField.nextField=myForm.elements[nextFieldName];
+
+    if (myField.maxLength == null)
+       myField.maxLength=fakeMaxLength;
+
+    myField.onkeydown=autojump_keyDown;
+    myField.onkeyup=autojump_keyUp;
+    }
+
+    function autojump_keyDown()
+    {
+    this.beforeLength=this.value.length;
+    downStrokeField=this;
+    }
+
+    function autojump_keyUp()
+    {
+    if (
+       (this == downStrokeField) &&
+       (this.value.length > this.beforeLength) &&
+       (this.value.length >= this.maxLength)
+       )
+       this.nextField.focus();
+    downStrokeField=null;
+    }
+    //-->
+    </script>
+<header>
+    <h2>Recarga de puntos</h2>
+    <p>Selecciona el paquete de puntos que quieres e introduce tu tarjeta de crédito para comprar los puntos de subasta seleccionados.</p>
+</header>
+<form class="form-horizontal" method="post" action="{% url 'recharge' %}">
+    {% csrf_token %}
+    <input class="radiopoints" type="radio" name="points" value="10" checked="checked" />10 Puntos (5€)
+    <input class="radiopoints" type="radio" name="points" value="15" />15 Puntos (7€)
+    <input class="radiopoints" type="radio" name="points" value="30" />30 Puntos (20€)
+    <input class="radiopoints" type="radio" name="points" value="50" />50 Puntos (35€)
+    <input class="radiopoints" type="radio" name="points" value="100" />100 Puntos (60€)
+    <br />
+    <div class="cc">
+        <span>Tarjeta de crédito: </span>
+        <input class="inputCard form-control" type="number" min="1000" max="9999" size="4" maxlength="4" name="creditCard1" id="creditCard1" required /> -
+        <input class="inputCard form-control" type="number" min="1000" max="9999" size="4" maxlength="4" name="creditCard2" id="creditCard2" required /> -
+        <input class="inputCard form-control" type="number" min="1000" max="9999" size="4" maxlength="4" name="creditCard3" id="creditCard3" required /> -
+        <input class="inputCard form-control" type="number" min="1000" max="9999" size="4" maxlength="4" name="creditCard4" id="creditCard4" required />
+        <span id="expiration">Fecha de expiración: </span>
+        <select name='expireMM' id='expireMM'>
+            <option value=''>Mes</option>
+            <option value='01'>Enero</option>
+            <option value='02'>Febrero</option>
+            <option value='03'>Marzo</option>
+            <option value='04'>Abril</option>
+            <option value='05'>Mayo</option>
+            <option value='06'>Junio</option>
+            <option value='07'>Julio</option>
+            <option value='08'>Agosto</option>
+            <option value='09'>Septiembre</option>
+            <option value='10'>Octubre</option>
+            <option value='11'>Noviembre</option>
+            <option value='12'>Diciembre</option>
+        </select>
+        <select name='expireYY' id='expireYY'>
+            <option value=''>Año</option>
+            <option value='13'>2013</option>
+            <option value='14'>2014</option>
+            <option value='15'>2015</option>
+            <option value='16'>2016</option>
+            <option value='17'>2017</option>
+            <option value='18'>2018</option>
+            <option value='19'>2019</option>
+        </select>
+        <input class="inputCard" type="hidden" name="expiry" id="expiry" maxlength="4"/>
+    </div>
+    <input class="button body" type="submit" value="Comprar" />
+</form>
+<script type="text/javascript">
+<!--
+    autojump('creditCard1', 'creditCard2', 4);
+    autojump('creditCard2', 'creditCard3', 4);
+    autojump('creditCard3', 'creditCard4', 4);
+    autojump('creditCard4', 'expireMM', 4);
+    //-->
+</script>
+{% endblock %}
diff --git a/subastasIS2_django/subastas/templates/subastas/sale_successful.html b/subastasIS2_django/subastas/templates/subastas/sale_successful.html
new file mode 100644
index 0000000..7ccea49
--- /dev/null
+++ b/subastasIS2_django/subastas/templates/subastas/sale_successful.html
@@ -0,0 +1,11 @@
+{% extends "subastas/base.html" %}
+
+{% block title %}JDLS|Compra finalizada{% endblock %}
+
+{% block content %}
+
+<header>
+    <h2>¡Enhorabuena!</h2>
+    <p>Has finalizado tu compra correctamente. Puedes seguir participando en El Juego de la Subasta viendo las <a href="{% url 'auctions' %}">subastas</a> y <a href="{% url 'offers' %}">ofertas</a> activas.</p>
+</header>
+{% endblock %}
\ No newline at end of file
diff --git a/subastasIS2_django/subastas/templates/subastas/search_results.html b/subastasIS2_django/subastas/templates/subastas/search_results.html
new file mode 100644
index 0000000..75a8661
--- /dev/null
+++ b/subastasIS2_django/subastas/templates/subastas/search_results.html
@@ -0,0 +1,49 @@
+{% extends "subastas/base.html" %}
+
+{% block title %}JDLS|Resultados de búsqueda{% endblock %}
+
+{% block content %}
+{% if objects %}
+<header>
+    <h2>Resultados de la búsqueda</h2>
+    <p>A continuación se muestra la lista de los resultados a la búsqueda realizada: "{{ search_string }}"</p>
+</header>
+<table>
+    <thead>
+        <tr class="list">
+            <th class="list_head">Nombre del producto</th>
+            <th class="list_head">Descripción</th>
+            <th class="list_head">Imagen</th>
+            <th class="list_head">Fin de subasta</th>
+            <th class="list_head">Puntos para adquirir oferta</th>
+            <th class="list_head no_border">Fecha de creación</th>
+        </tr>
+    </thead>
+
+  {% for o in objects %}
+        <tr class="list">
+        <td class="list_body">{% if o.auction %}<a href="{% url 'auction_detail' o.auction.pk %}">{% else %}<a href="{% url 'offer_detail' o.offer.pk %}">{% endif %}{{ o.name }}</a></td>
+        <td class="list_body">{{ o.description }}</td>
+        <td class="list_body"><a href="{{ o.image.url }}"><img class="imageresults" src="{{ o.image.url }}"/></a></td>
+        {% if o.auction %}
+        <td class="list_body">{{ o.auction.end_date }}</td>
+        {% else %}
+        <td class="list_body">-</td>
+        {% endif %}
+        {% if o.offer %}
+        <td class="list_body">{{ o.offer.price }}</td>
+        {% else %}
+        <td class="list_body">-</td>
+        {% endif %}
+        <td class="list_body no_border">{% if o.auction %}{{ o.auction.start_date }}{% else %}{{ o.offer.start_date }}{% endif %}</td>
+        </tr>
+  {% endfor %}
+</table>
+{% else %}
+<header>
+    <h2>Resultados de la búsqueda</h2>
+    <p>No se ha encontrado ningún resultado para la búsqueda realizada: "{{ search_string }}"</p>
+</header>
+{% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/subastasIS2_django/subastas/urls.py b/subastasIS2_django/subastas/urls.py
index 743b5c4..6919e37 100644
--- a/subastasIS2_django/subastas/urls.py
+++ b/subastasIS2_django/subastas/urls.py
@@ -7,6 +7,8 @@
 urlpatterns = patterns('',
     url(r'^$', views.index, name='index'),
     url(r'^test/$', views.ListUsersView.as_view(), name='test'),
+    url(r'^help/$', views.help, name='help'),
+    url(r'^search/$', views.search, name='search'),
     url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'subastas/login.html'}, name='login'),
     url(r'^logout/$', 'django.contrib.auth.views.logout', {'next_page': 'index'}, name='logout'),
     url(r'^register/$', views.register_user, name='register'),
@@ -18,5 +20,10 @@
     url(r'^auctions/(?P<pk>\d+)/$', views.auction, name='auction_detail'),
     url(r'^offers/$', login_required(views.ListOffersView.as_view()), name='offers'),
     url(r'^offers/(?P<pk>\d+)/$', views.offer, name='offer_detail'),
+    url(r'^users/(?P<pk>\d+)/$', views.user, name='profile'),
+    url(r'^recharge/$', views.recharge, name='recharge'),
+    url(r'^success/$', views.success, name='success'),
+    url(r'^poll_auction/$', views.poll_auction, name='poll_auction'),
+    url(r'^poll_offer/$', views.poll_offer, name='poll_offer'),
     (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
     )
diff --git a/subastasIS2_django/subastas/views.py b/subastasIS2_django/subastas/views.py
index 2b627d0..3e3f3bd 100644
--- a/subastasIS2_django/subastas/views.py
+++ b/subastasIS2_django/subastas/views.py
@@ -1,13 +1,18 @@
+from datetime import timedelta
+
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from django.shortcuts import render
+from django.shortcuts import render, render_to_response
 from django.http import HttpResponse, HttpResponseRedirect
 from django.views.generic import ListView, DetailView
-from django.utils import timezone
-from subastas.forms import UserForm, AuctionUserForm, ItemForm, AuctionForm, OfferForm, BidForm, ActivationForm, SaleForm
-from subastas.models import Auction, Offer, AuctionUser
+from django.utils import timezone, simplejson as json
+
+from subastas.forms import UserForm, AuctionUserForm, ItemForm, AuctionForm, OfferForm, BidForm, ActivationForm, SaleForm, UpdateAuctionUserForm
+from subastas.models import Auction, Offer, AuctionUser, Item, Bid
+
+from django_simple_search.utils import generic_search
 
 
 class ListUsersView(ListView):
@@ -36,6 +41,14 @@ def index(request):
     return render(request, 'subastas/index.html')
 
 
+def help(request):
+    return render(request, 'subastas/help.html')
+
+
+def success(request):
+    return render(request, 'subastas/sale_successful.html')
+
+
 @login_required
 def test(request):
     context = {}
@@ -162,6 +175,7 @@ def create_item(request):
 def auction(request, pk):
     auction = Auction.objects.get(pk=pk)
     recharge = False
+    error = ''
 
     if request.method == 'POST':
         bid_form = BidForm(request.POST, user=request.user, auction=auction)
@@ -173,6 +187,7 @@ def auction(request, pk):
             bid.user.offer_points += 1
             bid.user.save()
             bid.auction.winner = bid.user
+            bid.auction.end_date += timedelta(minutes=1)
             bid.auction.save()
             bid.save()
 
@@ -188,7 +203,6 @@ def auction(request, pk):
 
     else:
         bid_form = BidForm()
-        error = ''
 
     ctx = {
         'auction': auction,
@@ -221,7 +235,7 @@ def offer(request, pk):
                 offer.sold = True
                 offer.save()
 
-                return HttpResponseRedirect(reverse('offers'))
+                return HttpResponseRedirect(reverse('success'))
 
         else:
             error = sale_form.errors.as_text().split(' * ')[1]
@@ -238,3 +252,124 @@ def offer(request, pk):
     }
 
     return render(request, 'subastas/offer_detail.html', ctx)
+
+
+@login_required
+def user(request, pk):
+    auction_user = AuctionUser.objects.get(pk=pk)
+
+    if request.method == 'POST':
+        edit_form = UpdateAuctionUserForm(request.POST, request.FILES,
+                                          instance=auction_user,
+                                          initial={
+                                          'description': auction_user.description,
+                                          'interests': auction_user.interests}
+                                          )
+        if edit_form.is_valid():
+            edit_form.save()
+
+            return HttpResponseRedirect(reverse('profile', kwargs={'pk': pk}))
+
+    else:
+        edit_form = UpdateAuctionUserForm(initial={
+                                          'description': auction_user.description,
+                                          'interests': auction_user.interests}
+                                          )
+
+        bids = Bid.objects.filter(user=auction_user)
+        auctions_bid = []
+        for b in bids:
+            if not b.auction in auctions_bid:
+                auctions_bid.append(b.auction)
+
+        auctions_won = Auction.objects.filter(winner=auction_user)
+        offers_won = Offer.objects.filter(winner=auction_user)
+
+    ctx = {
+        'auction_user': auction_user,
+        'edit_form': edit_form,
+        'auctions_bid': auctions_bid,
+        'auctions_won': auctions_won,
+        'offers_won': offers_won,
+    }
+
+    return render(request, 'subastas/profile.html', ctx)
+
+
+@login_required
+def recharge(request):
+    if request.method == 'POST':
+        auction_user = AuctionUser.objects.get(user=request.user)
+        points = request.POST.get('points')
+        auction_user.auction_points += int(points)
+        auction_user.save()
+
+        return HttpResponseRedirect(reverse('success'))
+
+    return render(request, 'subastas/recharge.html')
+
+
+@login_required
+def search(request):
+    QUERY = "searchField"
+    MODEL_MAP = {Item: ["name"]}
+
+    objects = []
+
+    for model, fields in MODEL_MAP.iteritems():
+        objects += generic_search(request, model, fields, QUERY)
+
+    return render_to_response("subastas/search_results.html",
+                              {"objects": objects,
+                               "search_string": request.GET.get(QUERY, ""),
+                               })
+
+
+@login_required
+def poll_auction(request):
+    auction = Auction.objects.get(pk=request.GET["pk"])
+    bids = len(Bid.objects.filter(auction=auction))
+
+    end_date = {
+        "year": auction.end_date.year,
+        "month": auction.end_date.month,
+        "day": auction.end_date.day,
+        "hour": auction.end_date.hour,
+        "minute": auction.end_date.minute,
+        "second": auction.end_date.second,
+    }
+
+    n = timezone.now()
+    now = {
+        "year": n.year,
+        "month": n.month,
+        "day": n.day,
+        "hour": n.hour,
+        "minute": n.minute,
+        "second": n.second,
+    }
+
+    res = {"winner": auction.winner.user.username,
+           "winner_id": auction.winner.user.pk,
+           "bids": bids,
+           "end_date": end_date,
+           "now": now,
+           }
+
+    return HttpResponse(json.dumps(res))
+
+
+@login_required
+def poll_offer(request):
+    offer = Offer.objects.get(pk=request.GET["pk"])
+
+    sold = 'false'
+    if offer.sold:
+        sold = 'true'
+
+    res = {"winner": offer.winner.user.username,
+           "winner_id": offer.winner.user.pk,
+           "sold": sold,
+           }
+
+    return HttpResponse(json.dumps(res))
diff --git a/subastasIS2_django/subastasIS2_django/settings.py b/subastasIS2_django/subastasIS2_django/settings.py
index e15c06b..0ca983c 100644
--- a/subastasIS2_django/subastasIS2_django/settings.py
+++ b/subastasIS2_django/subastasIS2_django/settings.py
@@ -47,6 +47,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'subastas',
+    'django_simple_search',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -93,10 +94,10 @@
 STATIC_URL = '/static/'
 
 # LOGIN redirection page
-LOGIN_URL = '/subastas/login/'
+LOGIN_URL = '/login/'
 
 # MEDIA storage location
-MEDIA_URL = '/subastas/media/'
+MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'subastas/media/')
 
 STATICFILES_DIRS = (
diff --git a/subastasIS2_django/subastasIS2_django/urls.py b/subastasIS2_django/subastasIS2_django/urls.py
index 2e19077..da7e894 100644
--- a/subastasIS2_django/subastasIS2_django/urls.py
+++ b/subastasIS2_django/subastasIS2_django/urls.py
@@ -5,8 +5,6 @@
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # url(r'^$', 'subastasIS2_django.views.home', name='home'),
-    url(r'^$', RedirectView.as_view(url='/subastas/')),
+    url(r'^', include('subastas.urls')),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^subastas/', include('subastas.urls')),
 )