Merge branch 'feature/test3' of https://github.com/Ganco/KNU_Market into feature/temp4

Conflicts:
	app/src/main/res/layout/activity_post.xml
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin
cache update