many "best practices" improvements
small bugfixes
many "best practices" improvements
Merge pull request #36 from amikhile/master

restricting catalogs input token search
Session with Oleg
Merge remote-tracking branch 'refs/remotes/origin/master'
Missed comma :(
bugfix
multipluck has problem with id column; solution
Autocomplete of Labels for Container
CSS for navbar with categories
bugfix: use explicit name to render in order to support alias
Replace development solr to production one
Use another progress bar for solr re-indexing
Ignore configuration files
1. Design stuff
2. Catalogs
moving find all catalog children method to model
Adding files retrive api first version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/catalog.rb
Adding search for file_ids api