Shorts code in progress
resolved merge conflicts in Filmdetail.java and SplashScreenActivity.java
Merge branch 'master' of https://github.com/Sravan2j/Cinequest-Android
shorts done
Added Jars for Merge Adapter
Merge branch 'master' of https://github.com/Sravan2j/Cinequest-Android