Faris : Fixed conflicts.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
#1847 | Viky/Deepthi | Tabs not shown for unauthorized users
[#1652] Faris : Cleaned up the error messages in models.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #544 from akash/master

#1803 - replacing dates in form sections with actual date fields
Merge pull request #543 from farismosman/master

[1652] [Task] Cleanup validation custom messages in models
1843 | Subhas/Viky | Updated ubuntu installer to use LXC, to avoid running into dependency hell
Merge pull request #540 from rdsubhas/master

1843 | Generate ubuntu installer using LXC
Added rvmrc file for ruby 1.9.3-p392 with gemset rapidftr
Merge pull request #542 from deepthirera/master

Unauthorized side tabs removed from view
1836 | Subhas/Kavitha | Bump rapidftr_addon_cpims version