login page new
Login page
Fixed prettyPhoto completely
Merge branch 'issue-156' into develop
resolving conflicts and merging issue-154 into develop
Merge branch 'develop'