modified rakefile
minor changes
separating the view
Merge branch 'develop'
separating js