modifications and conditions done on indent code
Merge branch 'master' of https://github.com/sudhakarDharwada/JavaTraining2014_15