#7 User Profile Model create
#7 User Profile Created
Merge branch 'develop' of https://github.com/E-SGKYARDIM/E-SGKYARDIM into develop

Conflicts:
	.idea/.generators
	.idea/E-SGK.iml
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/vcs.xml
	.idea/workspace.xml
	config/routes.rb
	db/schema.rb
Merge branch 'develop' of https://github.com/E-SGKYARDIM/E-SGKYARDIM into develop

Conflicts:
	.idea/workspace.xml