Lam_4/3/2013
Merge remote-tracking branch 'origin/User-Page' into Admin-Page