Added util class to support squashing migrations
Updated changelog
Merge pull request #507 from opf/feature/rails3_add_migration_squasher

Feature/rails3 add migration squasher
adds indexes on users
Merge pull request #506 from opf/fix/index_on_users
update forgotten Gemfile.lock
replace the rendering of planning elements with rabl

added oj and multijson, as they are supposedly faster as oj is
supposedly faster than the default-engine: There are still lots of
switches in rabl left to improve the speed even more.

Currently, only the inde-templates have been replaced, other templates
have been left untouched: The tests now break, as there is a special
test for the replaced .rsb-file: This is a very specialised test, we
should probably replace this with tests for an expected json-response.
Added a spec for the json-response of the api
fixing the xml-spec for planning-elements
added created at and updated_at
resolving merge-issues in Gemfile.lock
missing changelog-entries added
Merge pull request #509 from opf/feature/migrate_to_rabl