25.9.14
Merge branch 'master' of https://github.com/dakrizma/jastuk

Conflicts:
	galerija.db
	galerija/models.pyc
	galerija/templates/galerija/ajax.html
	galerija/templates/galerija/image.html
	galerija/urls.pyc
	galerija/views.py
	galerija/views.pyc
	jastuk/settings.pyc
	jastuk/static/images/slikica.jpg
25.9.14