Added password support to the model.
The password will be saved as a md5-hash in the model.
Edited the view: It supports authentication now.
Had to edit some "requires" because they didn't work for me.
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2012-team2 into passwd
Created controller & view.
Edited some controllers & views (main, register..) to be compatible with
passwords.
Implemented changement of passwords. (Model, View and Controller)
Squashed commit of the following:

commit 3528d7a10753b12c2729f2ee92a9b8958c9d84f7
Author: Arun Sittampalam <arun@sittampalam.ch>
Date:   Mon Oct 8 22:08:09 2012 +0200

    Created controller & view.
    Edited some controllers & views (main, register..) to be compatible with
    passwords.

commit 8b522f376cb1f9096826d69320ea973c9867802e
Merge: 5bedd08 4caecc7
Author: Arun Sittampalam <arun@sittampalam.ch>
Date:   Mon Oct 8 19:30:26 2012 +0200

    Merge branch 'master' of https://github.com/ese-unibe-ch/ese2012-team2 into passwd

commit 5bedd08bd6bb5fbbeedfd3503116b1475ac5e30b
Author: Arun Sittampalam <arun@sittampalam.ch>
Date:   Mon Oct 8 16:16:30 2012 +0200

    Edited the view: It supports authentication now.
    Had to edit some "requires" because they didn't work for me.

commit 4fd74addb915ee11b8f279d7ace3fbdcb61ac596
Author: Arun Sittampalam <arun@sittampalam.ch>
Date:   Mon Oct 8 15:07:19 2012 +0200

    Added password support to the model.
    The password will be saved as a md5-hash in the model.
changed item contoller name
Merged the new DataOverlay into the master
The DataOverlay class is a singleton for managing users and items.
All access should now be handled via this class.

Squashed commit of the following:

commit a985960a0b0230b70ba75d47417850e586511245
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 11:35:35 2012 +0200

    fixed the bug that the activation or deactivation of an item would lead to a crash

commit aeafdb907cb848c5f4da268af1443529a4675d9e
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 11:32:59 2012 +0200

    main controller now uses DataOverlay. fixed bugs in item and DataOverlay

commit 406857d3342c159ed07142cbf04bbc121db278f9
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 11:13:55 2012 +0200

    item controller now uses DataOverlay

commit 7c8e75d2340270f4bf114acc90e91cfdb8c85d46
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 11:10:39 2012 +0200

    change_password controller now uses DataOverlay

commit 66a97d56d1da2b628e62785363eee7a80c2efbc9
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 11:03:35 2012 +0200

    authentication controller now uses the DataOverlay to retrieve the user

commit cb5db961d5d2f62959a475891aa7de6521c6c558
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 10:59:00 2012 +0200

    initial itemset now created using the DataOverlay class.

commit aef02ca145ed8e78ce4dbd08fc0aa64020fb9f15
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 10:12:15 2012 +0200

    dafuq have you done with the requires?
    I fixed the requires to run the App

commit e6537723b279cc7bf7867250a93fab72979ac062
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 07:36:25 2012 +0200

    add a new teset to the data overlay

commit ac4772adbd4e876934b44c22698f4dc99490623d
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Tue Oct 9 07:19:55 2012 +0200

    implemented the skeleton

commit 903bc79398e8d3cedc297246e737981b7a2fc861
Merge: b12f3ec b6fc83f
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Mon Oct 8 23:58:50 2012 +0200

    Merge remote-tracking branch 'origin/master' into DataOverlay

commit b12f3ecba77dd1f26e414fee02c9459bbfa50adf
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Mon Oct 8 23:57:10 2012 +0200

    implemented the items_by_users function. started writing tests

commit 6da85fe08d3639247807fc0c1879cee3c6167c17
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Mon Oct 8 16:31:03 2012 +0200

    written a first skeleton and started implementing functions

commit 4f47040ff136bac2eb05cf13e9b5c4185292efa9
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Mon Oct 8 13:40:35 2012 +0200

    created the DataOverlay class
added default images for items and users
added Bundler support for gems

to install all needed gems just run "bundle install" in the project
root then start the server as before.
bundler merge conflicts solved
fixed test requires
app require fix

forgot the require_relative, sry
public folder settings changed
Merge remote-tracking branch 'origin/passwd' into passwd
Edit-button added
gemfile.lock added platform

no idea why :P
Added some safeness to password changing.
Merge branch 'passwd'
adaptet item_controller and added edit_item, not yet running
adapted item_controller and added edit_item, not yet running