Basic comment implementation
Create comments
Merge develop with comments
add images from marker in assets
create model Status
add status_id to Problem
remove column status from Problem
fix seed
Problem create with new feature
show flag problem in accord status
Merge branch 'create_problem' into develop

Conflicts:
	app/models/problem.rb
	db/schema.rb
	db/seeds.rb
add ckeditor to problem form
dynamic change icon marker
change view map and form problem
add problems_path in nav
add default status in seeds
fix footer with new feature
fix index problems
add validate to list_status
add raw to problems description in show
delete IMC.sublime
Merge branch 'create_problem' into develop

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/problems.css.scss
	app/models/problem.rb
	config/routes.rb
merge with develop
Merge branch 'create_problem' into develop
Merge branch 'master' of github.com:AstraL/IMC into develop

Conflicts:
	app/models/user.rb