2014082200
Merge branch 'master' of https://github.com/germel/ovulg

Conflicts:
	corestuff/core.py