Merge pull request #42 from AdwinTrave/master

Moving the notice about disabled registration into language file
Merge pull request #45 from AdwinTrave/master

jQuery and HTML5 update
Update of Readme
Merge branch 'admin-panel' of github.com:AdwinTrave/A3M

Conflicts:
	application/controllers/account/account_profile.php
	application/views/head.php
Merge branch 'master' of github.com:donjakobo/A3M
Update config.php

Line 252:$config['sess_table_name'] 		= 'ci_session';
replace to
Line 252:$config['sess_table_name'] 		= 'ci_sessions';
Merge pull request #2 from chego77/patch-1

Thanks @chego77
I did it on my CI3 branch, but forgot it here.
Solves #48 and #49

Also has a quick fix for #50, I will revisit #50 later on.
Merge branch 'master' of github.com:AdwinTrave/A3M
Merge branch 'master' of github.com:AdwinTrave/A3M

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Removing site specific code

Accidentally pushed site specific code. This removes it.
Fixes for admin from the CI3 branch

Fixes unbaning and activation of permissions and roles.
Fixes #50

Updates the media icons and makes them bigger. Also it removes text that
is displayed on them.
Updating OpenID to version 2.2.2

This is an update of the OpenID helper files to the most recent version
to this date. 2.1.2 -> 2.2.2
Facebook remove missing fix

Fixes an issue where the Facebook remove is missing although it should
be removable.
Fixes for the DB

part of #51
Updating to CodeIgniter 2.1.4
Merge pull request #53 from AdwinTrave/CI3

Moving to CodeIgniter 3-dev
Merge pull request #52 from AdwinTrave/master

Merge admin panel to master, fixes and improvements
Merge pull request #54 from AdwinTrave/CI3

Updating CI3 and accounting for new Ucfirst rule