MASTER Added Rails Framework
Merged Master