ApplicationController added. Change style to conform to programming style rules.
Merge commit '4162fa37ed86b7cc21af133972228d1323f0b864'