Merge branch 'hotfix/1.9.4'
updated to rails 2.3.15
version bump
Merge branch 'hotfix/1.9.5' into develop