RapidFTR #1441 (Sumit/Nazneen) fixed the defect
Merge remote-tracking branch 'upstream/master' into profile_thumbnails
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
RapidFTR (Sumit/Nazneen) Removing the dead code.
Merge remote-tracking branch 'upstream/master' into profile_thumbnails
Faris - [#1466] Modified method init in application.js by adding a click on restore image button and waiting time when browser.webkit is true.
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge pull request #327 from farismosman/master

[#1466] Rotate buttons on edit photo works only on 2 clicks
Akash - removing more dead code
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Akash - removing more dead code
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Faris [# 1506]
- Changed the regex in to_lucene_query in search_criteria to be case-insensitive. The same was done in method build_joins.
- Defect is fixed, search can be done using OR/or.
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge pull request #328 from farismosman/master

[#1506] Advance Search - Search by name the OR option should be captalized 
Akash - upgrading rails to 3.0.17
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Akash - removing duplicate test and replacing with real one (as noted in issue #153 on github)
Revert "Akash - upgrading rails to 3.0.17"

This reverts commit 0b0ac09eb6025005b6c26e97a0526ea8e8acb428.
Akash - upgrading rails to 3.0.17