conflicting routes with webapps

Signed-off-by: Arpit Goyal <agmps17@gmail.com>
Merge pull request #71 from agmps18/rails-4

conflicting routes with webapps