Merge pull request #14 from PlumLabs/ed/rooms

Chage style to new Room
Add discount model and unit test
Add discount in AA
Add discounts in seed.rb
Merge pull request #12 from PlumLabs/sc/create_discount

Sc/create discount
Add edit room
Add change RMagick to MiniMagick
Add Photo Structure
Add lightbox for images
Add Jquery file upload gem
Add upload photos from ui
Remove show.html and change redirection paths