fixing things hopefully
Merge branch 'master' of https://github.com/kailashnagarkoti/JavatunesP-portlet

Conflicts:
	.classpath
gitignore
Merge branch 'master' of https://github.com/kailashnagarkoti/JavatunesP-portlet

Conflicts:
	.gitignore