problem show window formatted
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/app/app.js
	frontend/app/controllers/show-problem.js
	frontend/app/directives/index.js
	frontend/app/templates/showProblem.html
	frontend/style/css/admin.css
problem show window formatted
Merge remote-tracking branch 'origin/master'