Cleaning up temp files
Merge branch 'master' of github.com:ljvillanueva/pumilio

Conflicts:
	include/add/add_to_pumiliodb.py
	index.php