some renamings to make things clearer
Merge branch 'master' into sub_resources

Conflicts:
	monkful/resources.py