Update .gitignore
Merged Beta into Master

[Branch: master/version: 1.2.4]
Merge branch 'beta'

removed Documentation Folder - for merge

Conflicts:
	Documentation/classes/AisisCore_FileHandling_File.html
Added Documentation.

[Branch: master/version: 1.2.4]
Fixed merge conflict with .gitignore
Delete phpdoc-1380911143.errors.log
Delete phpdoc-1380911143.log
Delete phpdoc-1380912674.errors.log
Delete phpdoc-1380912674.log
Merge branch 'beta'
Updated readme.
removed files
Merge branch 'master' of https://github.com/AdamKyle/Aisis-Framework
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merged Beta
Update README.md

Added new link to 1.2.6 release notes
Added new inputs, added new css version.

We now have inputs (while not hooked up) that allow you to
enter text for navigation links - pagination.

We also changed the version of the theme from 1.2.6 to 1.2.6.1

[Branch: dev1.2.6.1]
Fixed issue where the text wouldnt appear in the input