Remove unused code
Fix issue #1
Rename a few ugly methods,enums and variables.
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display

Conflicts:
	content display/src/main/java/com/apptitive/content_display/StartActivity.java
	content display/src/main/java/com/apptitive/content_display/helper/DisplayPattern.java
	content display/src/main/res/values/strings.xml