Pridane auth do indexu
Merge branch 'master' of https://github.com/Marine-22/ERP

Conflicts:
	environment/lib/python2.6/site-packages/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo
	environment/lib/python2.6/site-packages/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
	environment/lib/python2.6/site-packages/django/contrib/auth/models.py
	environment/lib/python2.6/site-packages/django/contrib/auth/urls.py

Mergnuta implementacia resource managementu
Skompilovany django.po