changes are done
Merge https://github.com/sudhakarDharwada/JavaTraining2014_15