login,photo gallery,home
Merge remote-tracking branch 'origin/master'