commit 12/3/2014
Merge origin/master

Conflicts:
	formpersonal.php