UI initial commit
Production configuration settings for Solr
Support playtime duration field for FileAssets
New version; for admin - /admin
Popups for categories
virtual lesson
Merge pull request #30 from amikhile/master

added get languages api to routes
Virtual lessons support
replace thin with puma
index on ui: eef58f9 replace thin with puma
On ui: "setup"
Merge commit '696a4628c3b5a3e75082c334e832f5e0c921c629'

Conflicts:
	app/models/search.rb
missed file
replace thin with puma - back
On ui: "setup" (reverse-merged from commit 696a4628c3b5a3e75082c334e832f5e0c921c629)
Rails 3.2.10 have been released to address an SQL injection vulnerability in ActiveRecord.
.rvmrc - removed from repository
Bugix
Speed improvements
Rails 3.2.11 due to "Multiple vulnerabilities in parameter parsing in Action Pack"