WikiHelper class added
Merge branch 'master' of https://github.com/hariohmprasath/MusicManager

Conflicts:
	.idea/workspace.xml
	out/production/MusicManager/com/com/elastic/AlbumStorageUtils.class
	out/production/MusicManager/com/com/elastic/SongElasticUtils.class
	solr-4.6.0/example/logs/solr.log
	solr-4.6.0/example/solr/collection1/conf/schema.xml
	solr-4.6.0/example/solr/collection1/data/index/segments.gen
	src/com/com/elastic/SongElasticUtils.java
	src/com/music/pojo/Album.java
Commit