added mini-profiler
Merge branch 'development' into miniprofiler

Conflicts:
	Gemfile.lock