mapping
Merge branch 'model_layer' of https://github.com/SS-IT-Academy/EasyWay into model_layer

Conflicts:
	db/development.sqlite3