new design changes.

contains an error with viewpager
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare

Conflicts:
	RunForLife/res/layout/fragment_run.xml
	RunForLife/src/se/chalmers/group42/controller/RunActivity.java
	RunForLife/src/se/chalmers/group42/controller/RunFragment.java