Merge pull request #5 from AbertayHackers/development

Development
server fix
2 server fix
Talks update
Merge branch 'master' of github.com:AbertayHackers/hacksoc.co.uk

Conflicts:
	public_html/forum/admin/jscripts/codepress/codepress.css
	public_html/forum/admin/jscripts/codepress/license.txt
	public_html/forum/admin/styles/sharepoint/home.css
	public_html/forum/admin/styles/sharepoint/login.css
	public_html/forum/admin/styles/sharepoint/popup.css
	public_html/forum/admin/styles/sharepoint/style.css
	public_html/forum/admin/styles/sharepoint/user.css
	public_html/forum/cache/index.html
	public_html/forum/cache/themes/index.html
	public_html/forum/cache/themes/theme1/global.css
	public_html/forum/cache/themes/theme1/index.html
	public_html/forum/cache/themes/theme1/modcp.css
	public_html/forum/cache/themes/theme1/showthread.css
	public_html/forum/cache/themes/theme1/star_ratings.css
	public_html/forum/cache/themes/theme1/usercp.css
	public_html/forum/cache/themes/theme7/bootstrap-responsive.css
	public_html/forum/cache/themes/theme7/bootstrap.css
	public_html/forum/cache/themes/theme7/bootswatch.css
	public_html/forum/cache/themes/theme7/font-awesome.min.css
	public_html/forum/cache/themes/theme7/global.css
	public_html/forum/cache/themes/theme7/index.html
	public_html/forum/cache/themes/theme7/modcp.css
	public_html/forum/cache/themes/theme7/showthread.css
	public_html/forum/cache/themes/theme7/star_ratings.css
	public_html/forum/cache/themes/theme7/usercp.css
	public_html/forum/inc/languages/english.php
	public_html/forum/inc/languages/english/admin/config_attachment_types.lang.php
	public_html/forum/inc/languages/english/admin/config_badwords.lang.php
	public_html/forum/inc/languages/english/admin/config_banning.lang.php
	public_html/forum/inc/languages/english/admin/config_calendars.lang.php
	public_html/forum/inc/languages/english/admin/config_help_documents.lang.php
	public_html/forum/inc/languages/english/admin/config_languages.lang.php
	public_html/forum/inc/languages/english/admin/config_mod_tools.lang.php
	public_html/forum/inc/languages/english/admin/config_module_meta.lang.php
	public_html/forum/inc/languages/english/admin/config_mycode.lang.php
	public_html/forum/inc/languages/english/admin/config_plugins.lang.php
	public_html/forum/inc/languages/english/admin/config_post_icons.lang.php
	public_html/forum/inc/languages/english/admin/config_profile_fields.lang.php
	public_html/forum/inc/languages/english/admin/config_settings.lang.php
	public_html/forum/inc/languages/english/admin/config_smilies.lang.php
	public_html/forum/inc/languages/english/admin/config_spiders.lang.php
	public_html/forum/inc/languages/english/admin/config_thread_prefixes.lang.php
	public_html/forum/inc/languages/english/admin/config_warning.lang.php
	public_html/forum/inc/languages/english/admin/forum_akismet.lang.php
	public_html/forum/inc/languages/english/admin/forum_announcements.lang.php
	public_html/forum/inc/languages/english/admin/forum_attachments.lang.php
	public_html/forum/inc/languages/english/admin/forum_management.lang.php
	public_html/forum/inc/languages/english/admin/forum_moderation_queue.lang.php
	public_html/forum/inc/languages/english/admin/forum_module_meta.lang.php
	public_html/forum/inc/languages/english/admin/global.lang.php
	public_html/forum/inc/languages/english/admin/home_credits.lang.php
	public_html/forum/inc/languages/english/admin/home_dashboard.lang.php
	public_html/forum/inc/languages/english/admin/home_module_meta.lang.php
	public_html/forum/inc/languages/english/admin/home_preferences.lang.php
	public_html/forum/inc/languages/english/admin/home_version_check.lang.php
	public_html/forum/inc/languages/english/admin/index.html
	public_html/forum/inc/languages/english/admin/style_module_meta.lang.php
	public_html/forum/inc/languages/english/admin/style_templates.lang.php
	public_html/forum/inc/languages/english/admin/style_themes.lang.php
	public_html/forum/inc/languages/english/admin/tools_adminlog.lang.php
	public_html/forum/inc/languages/english/admin/tools_backupdb.lang.php
	public_html/forum/inc/languages/english/admin/tools_cache.lang.php
	public_html/forum/inc/languages/english/admin/tools_file_verification.lang.php
	public_html/forum/inc/languages/english/admin/tools_mailerrors.lang.php
	public_html/forum/inc/languages/english/admin/tools_maillogs.lang.php
	public_html/forum/inc/languages/english/admin/tools_modlog.lang.php
	public_html/forum/inc/languages/english/admin/tools_module_meta.lang.php
	public_html/forum/inc/languages/english/admin/tools_optimizedb.lang.php
	public_html/forum/inc/languages/english/admin/tools_php_info.lang.php
	public_html/forum/inc/languages/english/admin/tools_recount_rebuild.lang.php
	public_html/forum/inc/languages/english/admin/tools_statistics.lang.php
	public_html/forum/inc/languages/english/admin/tools_system_health.lang.php
	public_html/forum/inc/languages/english/admin/tools_tasks.lang.php
	public_html/forum/inc/languages/english/admin/tools_warninglog.lang.php
	public_html/forum/inc/languages/english/admin/user_admin_permissions.lang.php
	public_html/forum/inc/languages/english/admin/user_banning.lang.php
	public_html/forum/inc/languages/english/admin/user_group_promotions.lang.php
	public_html/forum/inc/languages/english/admin/user_groups.lang.php
	public_html/forum/inc/languages/english/admin/user_mass_mail.lang.php
	public_html/forum/inc/languages/english/admin/user_module_meta.lang.php
	public_html/forum/inc/languages/english/admin/user_titles.lang.php
	public_html/forum/inc/languages/english/admin/user_users.lang.php
	public_html/forum/inc/languages/english/akismet.lang.php
	public_html/forum/inc/languages/english/announcements.lang.php
	public_html/forum/inc/languages/english/archive.lang.php
	public_html/forum/inc/languages/english/calendar.lang.php
	public_html/forum/inc/languages/english/customhelpdocs.lang.php
	public_html/forum/inc/languages/english/customhelpsections.lang.php
	public_html/forum/inc/languages/english/datahandler_event.lang.php
	public_html/forum/inc/languages/english/datahandler_pm.lang.php
	public_html/forum/inc/languages/english/datahandler_post.lang.php
	public_html/forum/inc/languages/english/datahandler_user.lang.php
	public_html/forum/inc/languages/english/editpost.lang.php
	public_html/forum/inc/languages/english/forumdisplay.lang.php
	public_html/forum/inc/languages/english/global.lang.php
	public_html/forum/inc/languages/english/helpdocs.lang.php
	public_html/forum/inc/languages/english/helpsections.lang.php
	public_html/forum/inc/languages/english/index.html
	public_html/forum/inc/languages/english/index.lang.php
	public_html/forum/inc/languages/english/mailhandler.lang.php
	public_html/forum/inc/languages/english/managegroup.lang.php
	public_html/forum/inc/languages/english/member.lang.php
	public_html/forum/inc/languages/english/memberlist.lang.php
	public_html/forum/inc/languages/english/messages.lang.php
	public_html/forum/inc/languages/english/misc.lang.php
	public_html/forum/inc/languages/english/modcp.lang.php
	public_html/forum/inc/languages/english/moderation.lang.php
	public_html/forum/inc/languages/english/newreply.lang.php
	public_html/forum/inc/languages/english/newthread.lang.php
	public_html/forum/inc/languages/english/online.lang.php
	public_html/forum/inc/languages/english/polls.lang.php
	public_html/forum/inc/languages/english/portal.lang.php
	public_html/forum/inc/languages/english/printthread.lang.php
	public_html/forum/inc/languages/english/private.lang.php
	public_html/forum/inc/languages/english/ratethread.lang.php
	public_html/forum/inc/languages/english/report.lang.php
	public_html/forum/inc/languages/english/reputation.lang.php
	public_html/forum/inc/languages/english/search.lang.php
	public_html/forum/inc/languages/english/sendthread.lang.php
	public_html/forum/inc/languages/english/showteam.lang.php
	public_html/forum/inc/languages/english/showthread.lang.php
	public_html/forum/inc/languages/english/stats.lang.php
	public_html/forum/inc/languages/english/syndication.lang.php
	public_html/forum/inc/languages/english/trash.lang.php
	public_html/forum/inc/languages/english/usercp.lang.php
	public_html/forum/inc/languages/english/usercpnav.lang.php
	public_html/forum/inc/languages/english/warnings.lang.php
	public_html/forum/inc/languages/english/xmlhttp.lang.php
	public_html/forum/inc/languages/index.html
	public_html/forum/inc/plugins/autoredirect.php
	public_html/forum/inc/plugins/trash.php
	public_html/forum/inc/settings.php
	public_html/forum/uploads/avatars/index.html
	public_html/forum/uploads/index.html
	public_html/includes/class.MyBBIntegrator.php
	public_html/index.php
	public_html/talks.php
Merge pull request #6 from AbertayHackers/master

Fixing git fail