donate button
Merge pull request #22 from panique/develop

donate button
Merge branch 'master' of github.com:devplanete/php-login-advanced

* 'master' of github.com:devplanete/php-login-advanced: (83 commits)
  Delete CHANGELOG.md
  Create CHANGELOG.md
  Update README.md
  Class in now called "PHPLogin", not "Login"
  Move into PHPLogin.php constructor
  constructor now loads config, libraries and lang
  constructor now loads config, libraries and lang
  small style adjustment
  spelling mistake
  Update README.md
  Update README.md
  Update README.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  Add registration options support
  Add 2 pictures
  New beautiful style :)
  New beautiful style :)
  New beautiful style :)
  New beautiful style :)
  ...

Conflicts:
	README.md
Init

Conflicts:

	_installation/02-create-user-table.sql
	config/config.php
	views/register.php
Merge branch 'master' of github.com:devplanete/php-login-advanced into HEAD

* 'master' of github.com:devplanete/php-login-advanced: (83 commits)
  Delete CHANGELOG.md
  Create CHANGELOG.md
  Update README.md
  Class in now called "PHPLogin", not "Login"
  Move into PHPLogin.php constructor
  constructor now loads config, libraries and lang
  constructor now loads config, libraries and lang
  small style adjustment
  spelling mistake
  Update README.md
  Update README.md
  Update README.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  Add registration options support
  Add 2 pictures
  New beautiful style :)
  New beautiful style :)
  New beautiful style :)
  New beautiful style :)
  ...

Conflicts:
	README.md
Merge branch 'master4'

* master4:

Conflicts:
	README.md