Joomla Baseline
Merge branch 'origin/master'

Conflicts:
	templates/jacky/css/bootstrap.css
	templates/jacky/css/dpSocialTimeline.css
	templates/jacky/css/font-awesome.min.css
	templates/jacky/css/images/border.png
	templates/jacky/css/images/controls.png
	templates/jacky/css/images/ie6/borderBottomCenter.png
	templates/jacky/css/images/ie6/borderBottomLeft.png
	templates/jacky/css/images/ie6/borderBottomRight.png
	templates/jacky/css/images/ie6/borderMiddleLeft.png
	templates/jacky/css/images/ie6/borderMiddleRight.png
	templates/jacky/css/images/ie6/borderTopCenter.png
	templates/jacky/css/images/ie6/borderTopLeft.png
	templates/jacky/css/images/ie6/borderTopRight.png
	templates/jacky/css/images/loading.gif
	templates/jacky/css/images/loading_background.png
	templates/jacky/css/images/overlay.png
	templates/jacky/css/layout.css
	templates/jacky/css/normalize.css
	templates/jacky/font/fontawesome-webfont.eot
	templates/jacky/font/fontawesome-webfont.ttf
	templates/jacky/font/fontawesome-webfont.woff
	templates/jacky/html/mod_menu/default.php
	templates/jacky/html/mod_menu/default_url.php
	templates/jacky/images/ajax-loader.gif
	templates/jacky/images/clock.png
	templates/jacky/images/columns.png
	templates/jacky/images/dark/ajax-loader.gif
	templates/jacky/images/dark/clock.png
	templates/jacky/images/dark/columns.png
	templates/jacky/images/dark/facebook.png
	templates/jacky/images/dark/favorite.png
	templates/jacky/images/dark/link.png
	templates/jacky/images/dark/one_column.png
	templates/jacky/images/dark/pointer.png
	templates/jacky/images/dark/reply.png
	templates/jacky/images/dark/retweet.png
	templates/jacky/images/dark/spine.png
	templates/jacky/images/dark/timeline.png
	templates/jacky/images/dark/twitter.png
	templates/jacky/images/dark/video.png
	templates/jacky/images/favicons/delicious.png
	templates/jacky/images/favicons/digg.png
	templates/jacky/images/favicons/dribbble.png
	templates/jacky/images/favicons/facebook.png
	templates/jacky/images/favicons/flickr.png
	templates/jacky/images/favicons/google.png
	templates/jacky/images/favicons/instagram.png
	templates/jacky/images/favicons/lastfm.png
	templates/jacky/images/favicons/pintrest.png
	templates/jacky/images/favicons/tumblr.png
	templates/jacky/images/favicons/twitter.png
	templates/jacky/images/favicons/vimeo.png
	templates/jacky/images/favicons/youtube.png
	templates/jacky/images/light/ajax-loader.gif
	templates/jacky/images/light/clock.png
	templates/jacky/images/light/columns.png
	templates/jacky/images/light/facebook.png
	templates/jacky/images/light/favorite.png
	templates/jacky/images/light/link.png
	templates/jacky/images/light/one_column.png
	templates/jacky/images/light/pointer.png
	templates/jacky/images/light/reply.png
	templates/jacky/images/light/retweet.png
	templates/jacky/images/light/spine.png
	templates/jacky/images/light/timeline.png
	templates/jacky/images/light/twitter.png
	templates/jacky/images/light/video.png
	templates/jacky/images/link.png
	templates/jacky/images/one_column.png
	templates/jacky/images/spine.png
	templates/jacky/images/timeline.png
	templates/jacky/images/video.png
	templates/jacky/img/twitter.png
	templates/jacky/img/uganda1.jpg
	templates/jacky/img/uganda2.jpg
	templates/jacky/img/uganda3.jpg
	templates/jacky/img/uganda4.jpg
	templates/jacky/img/uganda5.jpg
	templates/jacky/index.php
	templates/jacky/js/IE9.js
	templates/jacky/js/blank.gif
	templates/jacky/js/bootstrap-carousel.js
	templates/jacky/js/bootstrap.js
	templates/jacky/js/head.load.min.js
	templates/jacky/js/html5shiv.js
	templates/jacky/js/jquery-1.9.0.min.js
	templates/jacky/js/jquery.dpSocialTimeline.js
	templates/jacky/js/jquery.dpSocialTimeline.min.js
	templates/jacky/templateDetails.xml
	templates/jacky/templateDetails.xml.old
	templates/jacky/twitter_oauth/search.php
	templates/jacky/twitter_oauth/user_timeline.php