Interim photo upload fix
Delete familytree.sql
Merge branch 'master' of https://github.com/kuiqiang/thefamilytree

Conflicts:
	app/controllers/PictureController.php
	app/views/pages/profile.blade.php
	familytree.sql
	public/css/main.css
	public/css/main.css.map
	public/css/uploadfile.css
	public/js/main.js
	public/js/newsFeed.js