"improved pagination, added prop_handler and others"
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
F.A.Q. finished