Wireframe Settings 2

an updated take on the settings of the ITSL function
App
Progress bar updated
Updated my own version with Åsas color
ellipsize for article
Merge branch 'Rodrigo'

Conflicts:
	application/v1_0/mad2013_itslearning/res/layout/activity_main.xml
	application/v1_0/mad2013_itslearning/res/layout/list_group.xml
	application/v1_0/mad2013_itslearning/res/values/colors.xml

application/v1_0/mad2013_itslearning/src/com/example/mad2013_itslearning
/ExpandableListAdapter.java

application/v1_0/mad2013_itslearning/src/com/example/mad2013_itslearning
/MainActivity.java