initial commit
add updates
add upgrade.php and change calibreworks.com to calibrefx.com
Fix Upgrade, themes settings
add facebook comment widget
add more updates and fix couple bugs
add FRAMEWORK_BRANCH
Fix typos
Add FRAMEWORK_BRANCH
Merge branch 'development'

Conflicts:
	framework/lib/init.php
disable framework branch
disable too
Merge branch 'development'

Conflicts:
	framework/lib/init.php
Fix comments, upgrade, content and other fixes
add modernizr
fix content.php for calibrefx_before_post_title
Merge branch 'development'

Conflicts:
	framework/lib/init.php
add twitter widget and social settings
add footer_widget_class and many fixes
Merge branch 'development'
add body_onload