co,,
Merge branch 'master' of https://github.com/Trojanovs/Pagelous

Conflicts:
	res/layout/category.xml
	res/layout/category_list_item.xml
	src/com/smurtup/pagelous/CategoryActivity.java
	src/com/smurtup/pagelous/JSONParser.java
	src/com/smurtup/pagelous/lists/CategoriesListAdapter.java
	src/com/smurtup/pagelous/lists/CategoriesListFragment.java
	src/com/smurtup/pagelous/models/Category.java