testing branching
revert change for branch test
Merge pull request #124 from GeorgeCrecoukias/Development

Development
bug when updating user related to asset, fixed
closes #133
closes #135
I think I found all spots where escape was needed. added common.js with until to escape for javasript

closes #129
doesn't wrap text in jqgrid anymore
closes #128
apparantly there's a problem with the html5 on chrome. I switched to flash. Looks kinda laggy when the prompt comes up. I'll look more into this another time. For now it works, plupload always gives me grief.

fixed bug on escapehtml util method where if int type came in the function it would give errors. This was true for import alot of the time
#137
changed routing for song_list_song
added more security when adding song or updating member
#126
see how this is, I removed the max/min date restrictions and changed the year range a bit, should be fine.
#127
added plugin fittext that resizes font-size based on length of logo.

seems to work fine. Not sure if I'm keeping the band name there in the future though.
#118
visual notification for songlist
file cleanup,
songlist attr_Accessible fields
upgraded client validation gem (problems with this still)
#139
#115
working, still needs some refactoring
closes #115
closes #140 made body div fixed width and removed overflow for header in css
closes #139
redone song view and form and navigation

redone upload image and added image crop
new view song_list song index
#86
#132 made name not manditory, cropping image will ignore validations on user model
#132, #186, 138

search song by artist, name or number

slight fixes on song display

slight ui fixes and logic on profile image editing