RapidFTR (Sumit/Nazneen) Adding files that are required for creating installer for ubuntu (.deb file).
RapidFTR (Sumit/Nazneen) removing merge conflict.
RapidFTR (Sumit/Nazneen) Ubuntu Installer: minor changes to scripts. To make sunspot working chenged sunspot:start to sunspot:clean_start in app.rake file. And added absolute path to no_photo_clip.jpg file in child_media_controller.rb to fix file not found error with thin server.
RapidFTR (Sumit/Nazneen) Ubuntu Installer: on ubuntu machines bundle was throwing 'libv8 library not found' error by adding explicitly to the Gemfile worked.
Fixed merge conflict.
Subhas | Update Travis build status image
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'installer' of git://github.com/sumitmah/RapidFTR into sumitmah-installer

Conflicts:
	Gemfile.lock
Merge pull request #334 from farismosman/master

[#1512] Users without 'create & edit user' permission cannot change password
[Refactor] Yekkanti|Gowri reverted the couchdb configuration to the old one. Previously half baked checkin was made on the couchdb
Merge branch 'master' of git://github.com/rapidftr/RapidFTR