applications rb file fixed
js files added
conflict resolved