upgraded rails and started to add support for api usage
merge