rc1
Merge branch 'master' of https://github.com/crasyhorse/login_page

Conflicts:
	JSONFileDAO.php
	Session.php
	css/style.css
	download.php
	js/jquery-1.10.2.min.js
	link.json
	login.php
	sass/_main.scss
	sass/style.scss
	secret.json