toolbar design
toolbar design
Added ruby version to gemfile
Updated ruby version to 2.2.0
Merge pull request #11 from jokklan/features/toolbardesign

Features/toolbardesign
Added heroku 12 factor gem
Updated eventmachine
Removed strict dependencies
Updated gemspec
Added carriewave & dropzone as dependency
Merge branch 'develop' of https://github.com/jokklan/widgit-cms into develop

Conflicts:
	Gemfile
Merge branch 'develop' of https://github.com/jokklan/widgit-cms into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ebased
increasing z-index
resource update
gridify design