newest version
another commit :o)
Merge branch 'master' of https://github.com/9orky/esperonu

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	application/auctions/endpoints.pyc
	application/auctions/models.pyc
	application/auctions/views.py
	application/register/forms.pyc
	application/register/views.pyc
	application/user_profile/forms.pyc
	application/user_profile/views.pyc
	www/default/css/.sass-cache/22490e75cb4f4acc46ae76378c106d2b700a5c9b/mixins.scssc
	www/default/css/.sass-cache/22490e75cb4f4acc46ae76378c106d2b700a5c9b/screen.scssc
	www/default/js/global.js
beta2