Merged master
Railtie update
Added engine
Added junior_manifest
Merges modify-railtie