Merge branch 'master' of https://github.com/jagadeeshgithubk/repo

Conflicts:
	java8features/src/main/resources/ram.txt
	java8features/target/classes/ram.txtsdfsdfsd