commit

commit
d

d
d

d
Merge branch 'master' of https://github.com/jesikmin/odmProject

Conflicts:
	odmProject/settings.pyc
	odmProject/urls.pyc
	odmProject/wsgi.pyc
	rules/models.py