Pause button level works
working in highest score
remove strings that we do not need and include in the game end layouts things that i believe that should be included (not final layouts)
remove activities and layouts that we do not need and minor changes to some layouts but not final
The drag and drop layout working
added drag and drop support.
Merge branch 'level-branch'

Conflicts:
	src/se/kth/csc/iprog/matchme/android/GameActivity.java
Conflicts fixed
not working .. under construction
Add EndActivity and game_end_view
merged master and level branch
conflicts fixed
Game fixed
removed unecessary imports
Score algorithm added (To be updated)
delete unuseful images and add new
remove unnecessary images
design of layouts
Clean codes and commented
Merge branch 'master' of https://github.com/arindrakumardas/MatchMe

Conflicts:
	res/layout/load_view.xml