Merge branch 'release/20130726-release'

* release/20130726-release: (33 commits)
  bump version
  bugfix: forgot to change widget generator spec after changing edit view
  bugfix: developer bar: don't display obj class information on non cms page
  bugfix: remove teaser thumbnail, that gets generated automatically
  widget edit view pull request review
  update infopark gems
  bugfix: remove additional whitespace
  update changelog
  bugfix: only create entry in en.obj_classes.yml file for pages
  pull request review
  added example migration to all widgets
  remove controller class from body html tag
  add sublime project files to gitignore
  added examples to image-, maps- and text-widget
  bugfix: redirect_link? is not defined anymore
  show some respect for the reporter
  rename HeroUnitWidget to TeaserWidget
  rename blog entry to blog post
  bugfix: missing bundle after changing Gemfile
  fixed specs for the changed widgets
  ...
Merge branch 'release/20130911-release'

* release/20130911-release: (112 commits)
  bump version to 3.1.0
  update changelog
  update infopark sdk version to 6.9.4
  integrate feedback for redactor integration and editing styles
  update redactor to 9.1.3
  update changelog
  improve structure widget css
  bugfix: example generators were not called in the integration task
  bugfix: there were even more editing related files in kickstart that needed to be moved to the editing generator
  move redactor.js into vendor/assets
  turn fixed navbar into normal navbar
  cleanup example module
  remove rails_connector runtime dependency for the kickstarter
  don't restrict rails version explicitly, it is restricted by the infopark_rails_connector
  Integrate new examples in the kickstart generator
  extract social sharing example generator
  extract profile page example
  extract language switch example
  extract contact page example
  blog: extract example into own generator
  ...
Merge branch 'release/20130912-release'

* release/20130912-release:
  bump version to 3.1.1
  no message
  bugfix: image obj class creation failed on newly created projects
Merge branch 'release/20131028-release'

* release/20131028-release: (213 commits)
  bump version to 3.2.0
  bugfix: redactor textarea width
  use special resource object class `ResourceContainer`
  split assets into application and editing
  base64 font url is not required
  bugfix: data attribute name used to style the google map was changed
  update changelog
  remove restriction to only search in the published content
  update changelog
  refactor generators
  update test app gems
  update to latest infopark gems
  remove simple form initializer
  update changelog
  remove simple form gem dependency
  remove simple form from form builder
  remove simple form on profile page
  remove simple form for reset password page
  remove simple form for login page and login widget
  remove simple form for contact page
  ...
Merge branch 'release/release-20131112'

* release/release-20131112: (37 commits)
  bump version to 4.0.0
  bugfix: search form was not bootstrap conform
  fix specs
  update changelog
  update models
  update add_widget method in migrations
  remove widget spec
  remove box cell
  add therubyracer gem to the kickstart generator
  widget reform
  update changelog
  bugfix: css class was renamed
  minor changes
  use new workspace urls
  bugfix: remove blank line
  add navigation toggle translation
  minor indentation bugfix
  use new button style on null homepage content
  remove old responsive bootstrap integration
  forms
  ...
Merge branch 'develop' of github.com:infopark/infopark_kickstarter into develop
fixed no method error in the edit-view of the image-widget
bugfix: rake tasks: open infopark status page in browser

fixes #291
update to 2014
minor update
fixed image alignment bug in live mode
Merge branch 'develop' of github.com:infopark/infopark_kickstarter into develop
Merge branch 'develop' into feature/image-widget
remove headline property from the image-widget edit view
update test app gems
Merge pull request #292 from infopark/feature/image-widget

Feature/image widget
update redactor to version 9.1.9

fixes #293
Merge branch 'develop' into feature/diagram-widget

* develop:
  update redactor to version 9.1.9
  update test app gems
  remove headline property from the image-widget edit view
  fixed image alignment bug in live mode
  minor update
  update to 2014
  bugfix: rake tasks: open infopark status page in browser
  fixed no method error in the edit-view of the image-widget
bugfix: set correct default value
generate progressbars with javascript