UI initial commit
Fixing preparation lesson assingment to both preparation and first lesson part
adding comments
Merge pull request #29 from amikhile/master

Staying with preparation part if it was matched by pattern
Production configuration settings for Solr
Support playtime duration field for FileAssets
Support playtime duration field for FileAssets
Merge remote-tracking branch 'origin/master'
New version; for admin - /admin
Popups for categories
virtual lesson
adding get languages to the routes
Merge remote-tracking branch 'upstream/master'
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