Easy way to add new news items and template
Merge branch 'master' into newsfeed
Basic wall posts added
Fixed empty posts
Added commenting to wall posts
Merge branch 'master' of https://github.com/kingaM/SocialNetwork

Conflicts:
	scripts/create_tables.sql
	www/router.php
Merge branch 'profile'
Fix merge issue
Fixed bug when adding new post
Fixed bug in settings error reporting
Friends' posts now appear on newsfeed
Merge branch 'newsfeed'
Fixed bug where only initially displayed buttons worked
Friends in circles now displaying properly
Changed register to use bootstrap and javascript
Added some url checks in router.php
Added basic search functionality to messages
Added cancel button to messages search
Updated login to use bootstrap and incorporated it into the same page as register
Added Username autocomplete to messages