Adding prod/develop database settings
Fixing merge issues
Displaying an advert underneath the first post
Merge branch 'master' into develop

Conflicts:
	conf/app.conf
Implementing pagination logic
Updating header styles, reducing font size
Completing pagination logic

Updating styles to display pagination next/prev correctly
Setting posts per page to 10