composer.json
composer.json
one last time...I hope
a few editorial changes
Activation message grammar tweaks per @simplemama
Merge pull request #123 from michaelbeil/patch-5

Activation message grammar tweaks per @simplemama
Merge pull request #122 from michaelbeil/patch-4

a few editorial changes
Squashed commit of the following:

commit d948bea0bf1e4cbe680633d1d5e7cc00c039bb0f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 17 07:20:06 2014 -0500

    arrive() to video component and main js array

commit e0c9f80b4aadd02ff984435ee1a12242ffe246cb
Author: E.T.Cook <e@etc.io>
Date:   Tue Sep 16 17:57:21 2014 -0500

    fix spacing

commit d4265b37eb817d96a3585efd7ffe367888553e5a
Author: E.T.Cook <e@etc.io>
Date:   Tue Sep 16 17:40:31 2014 -0500

    use DOM mutation observer w/ arrive

commit 0236e5cfeaf67cd8ed77d7abb19ebacc9251990f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Sep 16 15:08:21 2014 -0500

    description tweak

commit 0c3309abc7485ee0682018d5b479d24e6e5bf71f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 15 08:27:56 2014 -0500

    cursor:pointer hack for mobile safari

commit d707945bec84653849d18513dc0e377cbbdd0bd5
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 15 08:14:21 2014 -0500

    possible fix for #131

commit c3288f5774dd02952d241b1f5655a09249d38652
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 15:09:47 2014 -0500

    update copyright year fixes #124

commit dd5e7cae6c2580d332d65980d74f3a342347a303
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 15:06:58 2014 -0500

    activation message grammer tweak

    fixes #112

commit 269d7b0ea137a761fad9c0a6a3f509beda9759ec
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 15:04:17 2014 -0500

    help link fixes #108

commit 2213eab4e30b27d6e5d4f41074399b81adf8073a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 14:57:55 2014 -0500

    <code>style tweaks

    closes #119

commit b8ff064fd3b551f0547c59d2f8bf13abc45035e6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 13:11:51 2014 -0500

    even out padding on buttoninsert

commit 9a214c75117249af3008e757f8af42a22f74b68f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 13:06:27 2014 -0500

    make pretty for pc users

commit a7816c4db296e9a720e7a6c16db0679ea7b624b6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 12:01:40 2014 -0500

    fix self as source dissappearing on media insert

    fixes #95

commit 1159d1748d0517b31f350d50031fd0a1a867fdb1
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 11:30:01 2014 -0500

    fix missing timeline placeholder icon

commit 63d1fef8d2ad6b66fc26cdb5669ffda3267cc6f4
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 09:23:53 2014 -0500

    update translation strings

commit 46f597dbed9d69b29d03d6183a0b9bc3a779816c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 09:23:19 2014 -0500

    link to the post admin if empty map to setup markers

commit 0762ca6fb3d7e67c45733ba8e8eebafaa8d8b18c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 09:10:38 2014 -0500

    changelog

commit b42c700ebbb2d469a4e8ab5c31d1b951d849e428
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 09:10:05 2014 -0500

    Maps: better text bubble handling

    avoid an empty bubble on markers with no text entered

commit adce0b95083c2aca334466ae527f916a99d9fe63
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 09:03:28 2014 -0500

    restructure map meta function to be universal

commit 35082561f2092c5ef9cac77ac8817526a6fab94f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 08:56:10 2014 -0500

    changelog

commit 57fb3130f79ccc9f2c53b220c5986b211ae2eeae
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 08:44:24 2014 -0500

    Maps: automatic marker fallback if view empty

    if the user has not entered a starting coordinate, fallback to the first coordinate that they have entered and warn logged in users

    fixes #66

commit 0b0fa17c37ed98c49dca1d37a9c3f50b83c8bffd
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Sep 14 08:01:50 2014 -0500

    Maps: warn user on front end if no markers are entered

    prevents confusing empty state

    ref #66

commit 8152eb74338e2f0bf454047ed25e8f0ca6fa52c0
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 18:00:25 2014 -0500

    update translation strings

commit 1f34b2f0fd588277bb65bc8be597491259cb9aae
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 17:33:43 2014 -0500

    collections component height tweaks

commit c2ee4dc2af7b61765c446dea539c215b68adf8a6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 17:29:17 2014 -0500

    more semantics and set specific cache key

    for splash query in collections component

commit 3877cc7f862ef0db23433c7e3cde77d5f6473d02
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 17:22:57 2014 -0500

    semantics

commit 13bc8af65a01dda9e6fbbaee2ea537a0e2e636b1
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 17:10:36 2014 -0500

    content component responsive to mobile

commit de9f08a872cda801a4e511e2444f377611249136
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 17:01:07 2014 -0500

    fix floater position and alignment in content component

commit 84b243aa21fe40c222119c82c0fc9afe130dd5d4
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 16:51:03 2014 -0500

    content component floater direction

    default to down instead of up

commit 0e749d6c8dca65eeb8731f0dc8abaa0a6546eea4
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 13 16:50:13 2014 -0500

    content component parallax floater optimizations

    only run parallax if floater in view and autocalculate offsets

commit 4b1116bcb0401f4205b928504530e1c78aad7838
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 12 17:02:19 2014 -0500

    fix update/insert again

commit 40dbaf4bc027a13fa0eb9a23ec8fffe4ba007762
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 12 16:57:46 2014 -0500

    final responsive

commit b23e64705eb8d92b129b4b4937fe86e94ab39d3a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 12 16:26:19 2014 -0500

    50% width on small height - responsive

commit 205b6216108ba7447a7a29440dbe358ae697ea48
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 12 11:59:48 2014 -0500

    mo responsive

    http://cl.ly/image/2T121O0N2n22

commit 5fcb600f194247d4780e59c1bf31884255c49c41
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 12 11:18:36 2014 -0500

    start responsive and fix the button display:none

commit 0caf61fd0890d484b0b708f5dc242622864d7640
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 11 08:57:04 2014 -0500

    fix slug for i18n

commit a6901e55ab39fa338b2ee8e711d8ee7a1043661c
Author: E.T.Cook <e@etc.io>
Date:   Wed Sep 10 17:08:45 2014 -0500

    Fix #110

commit 4adf2cadb9edd3fc865317a11f4094c5d4f48872
Author: E.T.Cook <e@etc.io>
Date:   Wed Sep 10 15:47:43 2014 -0500

    Attempt at #127

commit 7d4ac3b12d8f6a5c682169b0c2545a662a71cd57
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Sep 9 17:19:28 2014 -0500

    sticky "insert component" button

commit 436aaaef952875235e17e587b78760e424b04a18
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 8 16:18:00 2014 -0500

    update strings

commit d58fffd8d0f6ee959a6adbb13791389983f3942e
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Sep 6 14:20:47 2014 -0500

    fixes #130

commit dbdc21791f6bf1946d827b4af3a6a5ec457e89db
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 5 18:06:50 2014 -0500

    1.0.94 - Beta 4

commit 7fed3c068e6337a874da47d1524455c17e102234
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 5 18:04:50 2014 -0500

    expanded Help tab text + update translatable strings

commit 194ee9043cca250295e64ca29bca7edbc071da45
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 5 15:47:22 2014 -0500

    changelog

commit f19ee7aa0d8dc08735d209bce3fad4419d2e8b44
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Sep 5 15:09:33 2014 -0500

    fix captions and titles in galleries

    plus add captions to grid gallery fixes #129

commit 0e7868a3e390d69aad011e084af9619d330b34c4
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 19:36:22 2014 -0500

    update strings

commit 0bc51238bcfcadbab414ef82bb80d47bdb899dbc
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 19:28:12 2014 -0500

    cherry pick accidnetal commits to master

commit 37501938a65faa97c2e37763add961346813ce61
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 19:10:16 2014 -0500

    prev commit fixes #126

    fixes #126

commit f4db49d81f08e534e7a7edfdbce8e1bcafa50958
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 19:09:47 2014 -0500

    fix odd syntax

commit 629aa6f2d5f9fb5ec71344ae4bb1651429f06f22
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 19:04:46 2014 -0500

    changelog

commit 8f6822ea686372f8d75a3b07f05403968971ad42
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 19:01:42 2014 -0500

    second pass improved timeline component

    http://cl.ly/image/1E2E16463527

commit 98749abb73cce5064f136785aeb6a198f4d0128b
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 18:26:52 2014 -0500

    first pass revamped timeline component

    * this is a breaking change *

    the filter for aesop_timeline_scroll_container has chnage to article from 'entry-content'. this means the timeline component is now compatible with 99% of themes.

commit 05caf746cabb377b8b6a8eb2d80a14014d8fe4dc
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Sep 4 16:01:47 2014 -0500

    comment out console logging

commit 8f98b7b22f086dd5ffcc1fa78377d73776964b3c
Author: Jenny <jenny@simplemama.com>
Date:   Thu Sep 4 16:02:37 2014 -0400

    Removes px next to input boxes

    Fixes remaining on https://github.com/bearded-avenger/aesop-core/issues/125

commit 24f557929306206d1e93dce783e0329c472afedd
Author: Jenny <jenny@simplemama.com>
Date:   Thu Sep 4 15:50:58 2014 -0400

    Editor grammar / spelling fixes

    Fixes https://github.com/bearded-avenger/aesop-core/issues/125

commit a4ef85cf382cd1ea2f3e49bf36afbb2bd6c8a417
Merge: 7a4fa5b 1a3305a
Author: Nick Haskins <email@nickhaskins.com>
Date:   Wed Sep 3 20:25:49 2014 -0500

    Merge pull request #121 from michaelbeil/patch-3

    changed "for" to "of" to clarify

commit 1a3305ab25334283d230f83bb32846c0dbed7073
Author: Michael Beil <michaelbeil@me.com>
Date:   Wed Sep 3 20:24:49 2014 -0500

    changed "for" to "of" to clarify

commit 7a4fa5bc2896c49958117ac4fd28877cf21c83f6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 3 20:21:28 2014 -0500

    ixnay periods in LLC props @MichaelBeil

commit bdb1f7f4a9129cc9d474356234a966e62c6098be
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 3 19:54:30 2014 -0500

    add link in generator to donate to aesop and linsk to site

    define('AI_CORE_WATERMARK',false);

    to remove

commit ea370576d9493b7c943bdae0e07d0766696e84c7
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 3 18:11:43 2014 -0500

    ixnay clipboard control

    ref #116

    - lack of scissors icon woudl mean converting to font awesome
    - lack of fixed clipboard icon leaves users wondering where the component went after being cut

    Basically not good enough for launch.

commit e9926789f9533f2ecb6188217cf9d616510aad45
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 3 18:06:26 2014 -0500

    more robust and efficient waypoint filters for audio/video

    ref #83

commit 661b2daaa5a2ced17ab76a010f811a1970e3346a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 3 16:53:17 2014 -0500

    update title for clicpboard

commit 59c33262da3e00a03058b6f870a1394ddd8bdae6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Sep 3 16:25:02 2014 -0500

    fix the project link doh props @simplemama

commit ca65546149da79bbe912acb3fbda132a5b0334eb
Merge: 007c992 531d7e1
Author: Nick Haskins <email@nickhaskins.com>
Date:   Tue Sep 2 19:37:18 2014 -0500

    Merge pull request #111 from michaelbeil/patch-2

    Deleted an unnecessary 'the' in uploading in wp

commit 531d7e1b3db0ba15992ebc3c177324d727354e25
Author: Michael Beil <michaelbeil@me.com>
Date:   Tue Sep 2 19:34:13 2014 -0500

    Deleted an unnecessary 'the' in uploading in wp

commit 007c992236cfb4b2f209edb4dd51c0c8b3d2804f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Sep 2 18:02:08 2014 -0500

    update @etc username on .org

commit 6d41a567725d5344356b96122d9af795d77f756d
Author: E.T.Cook <e@etc.io>
Date:   Tue Sep 2 17:47:01 2014 -0500

    Fixed #101

commit f3a55ceca96dc10a8c2c71884a1858e046eed8e2
Author: E.T.Cook <e@etc.io>
Date:   Tue Sep 2 17:30:02 2014 -0500

    underscores

commit a647d2454874bbb974b5ddb15d5c37056e92d449
Merge: a690d9f 154aa51
Author: E.T.Cook <e@etc.io>
Date:   Tue Sep 2 17:28:36 2014 -0500

    Merge branch 'dev' of github.com:bearded-avenger/aesop-core into dev

    Conflicts:
    	admin/assets/js/tinymce/aiview/plugin.js
    	admin/assets/js/tinymce/aiview/plugin.min.js

commit a690d9fd8691c26c387200d44121e964ee0b3fa7
Author: E.T.Cook <e@etc.io>
Date:   Tue Sep 2 17:19:39 2014 -0500

    Issue with regex and underscore #90

commit 154aa51bbb64bf92e2a61a4788a749022c1ddd06
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 18:14:01 2014 -0500

    eliminate cached option queries until we can separate views

    fixes posts appearing in other add-on post optoins

commit b27a6f2fb491c34e7ce73a1c39c31b6d3bac22c5
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 16:53:27 2014 -0500

    fix bug with image upload option type

commit 8a537ab2fd51acdb29c074a10388c1257a9f3585
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 13:39:43 2014 -0500

    lower the image crop factor for parallax

    due to recent optimization

commit 21a75b58dddd1578886cb1b8f82b196bfa1b0905
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 12:56:24 2014 -0500

    height/width not needed since lazy update

commit faef736eb2827de92fbb8e9942d4e1d570cc0f8c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 10:20:10 2014 -0500

    update strings

commit f61ccc982f9797f721c1130c11ce6afb27a19de1
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 10:18:06 2014 -0500

    titles to button controls

commit 2e65a8d2b1d071d73342d0dea5ac2f695d02a201
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 08:51:15 2014 -0500

    new screenshot for readme

commit 40085317770fb19a9af1ded34736ea70a3bd8108
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 08:16:52 2014 -0500

    ASE 1.1 - Beta 3

commit 39e7c3aa70becbb614654eb89d7c7e3275a376fa
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 08:16:17 2014 -0500

    4.0 compatibiltiy notice

commit 6dcde8b56cfb4e29536a5f617a51346be10d8c5b
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Sep 1 08:15:43 2014 -0500

    changelog

commit 16d19583a2f0073dfa7175d858628ef5805f8741
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Aug 31 15:20:09 2014 -0500

    misc generator style tweaks

commit c3f23cf466fa3f02e568b943781e7339d5f25e69
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Aug 31 12:20:23 2014 -0500

    expand scope of media waypoints

    fixes #83

commit 9aaa268852db06cedf478cc23d829748153032c8
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sun Aug 31 07:52:39 2014 -0500

    cache the queries for fetching option types

commit 6be249098f33ce8105a32dba78834f8f76c3f764
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 17:09:10 2014 -0500

    correct video component icon for placeholder

commit c1662445439ad645ed35f44424ad99a8503bbcb2
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 16:43:16 2014 -0500

    changelog

commit 1c010f7e73bf9988ed8de39aa1d1b3495667c477
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 16:42:21 2014 -0500

    RTL support

    fixes #67

commit c49f3fa1263c0b30b487e22dc0c6d37b088e6012
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 15:17:01 2014 -0500

    new helper for addon api aesop_option_counter($count)

    used to fascilate easy creation of integer based dropdown options

commit 82e964ed53f8db598ec8f661ad54b445cb0c9ecc
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 14:58:25 2014 -0500

    general cleanup

commit c976a49827e3fd716a0ca8b3fc58d3c5d0941029
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 14:46:31 2014 -0500

    fix quote cite attribute type

commit dbcb125cdc0b519ff082e7c3c25414fe183e3416
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 14:38:07 2014 -0500

    remove a few more un-needed attributes due to automatic calculations

commit 93f4d9b87128640367b0b2d197a9262b737559c6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 14:32:56 2014 -0500

    automatic offsets means no need for offset attribute as a hack

commit 84a2dedd984e582a2ebea1ec5a13930345efd322
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 13:46:39 2014 -0500

    tweak offset position of floater

commit cd47e0291c9975e2bdb96b2759fb3fb2ce3bd79a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 13:10:08 2014 -0500

    auto create alt tag for character component image

commit ef403d2ee36035047dd1c3d9e4d3f76f04bdba87
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 13:07:26 2014 -0500

    automatic alt tag fallback

    for image component if no alt tag specified

commit 5296352e575e4b9455548ca088837a92e25c71cd
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 30 09:08:24 2014 -0500

    better support for chapter component in non-aesop themes

    tested and pictured in Genesis theme below
    http://cl.ly/image/2b271e2S0g26

commit 47ac5461b0d09c1a732024c5a27df8a19fb0bb36
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 29 15:55:12 2014 -0500

    changelog

commit 9e40d004e4386b6c4d60636144c629fd034359a6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 29 14:09:04 2014 -0500

    antialiasing to components in editor

commit be34bd322c34aaa4536591cd00d671c276efbb0f
Author: E.T.Cook <e@etc.io>
Date:   Fri Aug 29 01:52:49 2014 -0500

    Fixed #104

commit bc031a0ff295c3f89ec066a20171c72d53dc7944
Author: E.T.Cook <e@etc.io>
Date:   Fri Aug 29 01:12:40 2014 -0500

    Fixed #99

commit 35b81bf895a552093b7ca46045d760ae11b2b8c9
Author: E.T.Cook <e@etc.io>
Date:   Fri Aug 29 00:24:01 2014 -0500

    Fixed #100

commit b085020691fa881f83587cae06767f669a662e99
Author: E.T.Cook <e@etc.io>
Date:   Thu Aug 28 19:56:21 2014 -0500

    fix line break issue

commit 9c7b04c4f4bd0990e15d2b4922a346883c1505c0
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Aug 28 14:42:55 2014 -0500

    checks

commit 92df40fa6c0a3a064aedfb36181210c3d39e8a92
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 25 19:10:42 2014 -0500

    fix values error TISK TISK

commit bdbfd848dc163ca7a8156e666457e1da51956a31
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 25 16:23:25 2014 -0500

    more phase out unused label att

commit 19aba2df9676c76e40c5c10b869b3a2270ebcb7e
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 25 16:18:47 2014 -0500

    phase out the un-used "label" attribute in chapter heading

commit 5e733e1ef8dac2a2cb88b8aec8a64e9c4dae924e
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 25 16:08:57 2014 -0500

    chapter to target chapter write

    fixes chapter scrollnav not closing sections

commit 833115ed4e89ced174a1d4b7fb9d1f6f8c1795c0
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 25 14:43:52 2014 -0500

    misc ui tweaks

commit 0a554ebbf4f4f6040d582382d2f5c1251fc354e7
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 23 11:33:46 2014 -0500

    update translation strings

commit 343dd63486b1118fa45dcb117ff3d43999902cfe
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 23 11:31:58 2014 -0500

    tweak padding on genny settings panel

commit 067f79b4fd8f36b490f4942762f7e0e092512049
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 23 11:28:56 2014 -0500

    color coordinate like options for less confusion + move some opts

commit 8ec6866b110c91a3874addefd86065aba5634e48
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 23 10:58:01 2014 -0500

    punt conditional option loading

commit 5fd8ee245e0c20d7890a41effbc26927a4e894e3
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 23 08:40:56 2014 -0500

    set cookies for open option states

    ref #89

commit 094aa479f05e48c10e63c93147c1229340797d16
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 20:39:13 2014 -0500

    automatically feed in categories so user doesnt have to enter id

commit d102534a799b017e32193a3f0fee4fca31d9ef01
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 19:23:03 2014 -0500

    1.0.92 beta

commit 5b6cf8ae44a7c1d35555e7fd4d26cac1eb7b9db6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 19:19:32 2014 -0500

    better masking

commit 5457845b0ef1f8a7a6a1963744605ba9a7d85b6b
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 18:51:21 2014 -0500

    small screen responsive support

commit 4058b5dc789d68760bf557d08f5185678c0aac4d
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 16:07:36 2014 -0500

    update translation strings

commit a4928a48d34814656208c87e71e7cb47ee0669a6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 16:01:58 2014 -0500

    set default option post retriever to posts

commit f8c331b1ecddb797dc79778b61226c0395ce37dd
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 15:13:47 2014 -0500

    fix option type

commit 4e9a83d6e97af822e5cc2ea7e45629d6b6bf2c03
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 15:09:36 2014 -0500

    whoops! forgot one

commit 2d8035b3183200b64b49f6026d7cb00315bbfa6a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 15:08:21 2014 -0500

    clean out empty value arrays

commit 3048e3435d3787e18bd143ccd7e9a7fbadc4b16c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 14:52:14 2014 -0500

    proper gallery icon + comment function arg

commit 38e80379f1f00a72fb731afdebcb93f18ccccea7
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 14:47:07 2014 -0500

    better helper function for retrieving posts for options

commit f26357fd719601fb470575c1ce65869e3f0e95a0
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 14:39:01 2014 -0500

    i18n

commit 952926144cce5dbc9df4ceffdff28e1a086da41c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 13:44:14 2014 -0500

    1.0.91 - beta

commit a89e802d7ee697a1c51e0ecc0e8b50d91c06af63
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 13:40:45 2014 -0500

    icon/mask tweaks

commit e740cb3843b0b8922fe13e2dbe14dd1d4a5fe7f8
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 12:56:53 2014 -0500

    cleanup + better select opts logic + let users select gallery in generator

commit dfe36094de33da7c4d6cfa9dec22374aaaf785b9
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 11:07:15 2014 -0500

    control button spacing hover state

commit c83d52926d757e8a0526e4e8b9ba745648b8432b
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 11:01:18 2014 -0500

    style tweaks to placeholders

commit 509f65c2ae8cecd0945958f60ceed13d8e95b386
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 10:44:40 2014 -0500

    recompile

commit 2893bb806e72a1047b876ab2c534a898c045c229
Merge: 90b2d36 3859a79
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 10:42:38 2014 -0500

    Merge branch 'master' of github.com:etcook/aesop-core into etcook-master

    Conflicts:
    	admin/assets/js/generator.js.map
    	admin/assets/js/generator.min.js

commit 3859a79c4e2adfb7799ef4c2e7d7e3d69433f24d
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 09:59:07 2014 -0500

    do gallery icon and fix admin stylesheet

commit 2aa3b36f329c33fa96f64cc5100c9b269e9fa16d
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 08:41:21 2014 -0500

    gallery to genny

commit ab40fbd1fc31b4dc36797362ed0585196d8b5e51
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 22 07:18:41 2014 -0500

    mask

commit 83ee8c1bd7376d079d8fbe4ef8e4d27dddd4d4f7
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Aug 21 17:02:52 2014 -0500

    do missing component icons in placeholders

commit 740c28507639999cad785ecdbb9b5f27e56ee6cb
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Aug 21 14:08:58 2014 -0500

    action for 3rd party add-ons hooking into css for icon

commit 9b7d6a14dece6d36aabaac8ebd836394c644dca1
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 21:25:46 2014 -0500

    protecting the component regions

commit db9fdf7bc517062de45b8d52adc7c9f1a3549033
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 19:12:08 2014 -0500

    fixes

commit 4b8b16aa41b60e80489bf9014cc09c02a099575a
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 16:04:35 2014 -0500

    clipboard

commit 2d1885f2cabdd2cbccbed1f5c7be040cea6fe3f5
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 15:19:28 2014 -0500

    handle the controls manually

commit d57a6eff2b57dbc57cbdaa3d336ba33fcfa28b93
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 15:04:09 2014 -0500

    console logs

commit 523133d8dc1e00b657f7eb46b0e0cc5b9faf07c2
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 14:59:26 2014 -0500

    copy and paste

commit 523d1a1b933ab15779badd17dffa8a712e0fa542
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 13:12:29 2014 -0500

    changes

commit 0a747e45346fd639110114c91e04a05d590ed5f4
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 11:23:52 2014 -0500

    fixes

commit a77c10beaaa02130a33a3577f67434f1df4121ba
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 10:35:53 2014 -0500

    js

commit 2171d3ac8fe5bb52e14cc64ba5f730c47741db67
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 10:34:12 2014 -0500

    updates

commit a133a7be8eecfbed7e8706a5a7c75f9f2f432109
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 20 09:47:37 2014 -0500

    cleanup in master branch

commit 5d70167e0679ac166d9b5b5a60f46a5f530b203d
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 20:13:05 2014 -0500

    fix enters outside of the box

commit 723e638118af496924050542242d1d57811a1319
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 19:59:26 2014 -0500

    take over enter

commit 54f880cf5cc7d99d48069062929fcb735b6b7f9d
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 18:04:48 2014 -0500

    noneditable

commit 5966c30f40c851c61fbe2328e43d235867693b0a
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 17:46:59 2014 -0500

    my fault

commit 49e01aaf0e018a8cb8b9c644d4001fa08e01218f
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 17:44:41 2014 -0500

    try to retain the breaks

commit d6101702535aa81cfc3d7665d14d3dcf2d7d2704
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 17:36:14 2014 -0500

    activate min + mapping

commit dc3f895f043a82e1c9fee1840bf784e153f88992
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 17:34:42 2014 -0500

    minified versions

commit 60db8d3ee54aac00f548fe8178cefd14f9a40e34
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 17:26:26 2014 -0500

    filter out tinymce leftovers from line breaks

commit 44c958e4e8ca950b4e3f88ce6f2c877efcb26091
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 16:32:57 2014 -0500

    comments

commit ed54b7afe2fd4ad26c1e6be902e1940efb9d2516
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 16:24:30 2014 -0500

    recognize content and inject

commit 9c67bb3c3ad521855480eba517b2c056a316521b
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 16:10:48 2014 -0500

    fix

commit 90b2d36689bc0231835b94425b4c63028ddd6ecf
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Aug 19 14:08:41 2014 -0500

    conditional loading of options

    for example, don't show the parallax options in quote component if the user has set it to off

commit 6a9c7ddace297c65c843984176f018e54fbcd797
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Aug 19 12:55:40 2014 -0500

    gallery image size filters

    fixes #86

commit a1dd64874afda8d7294ff5aca565f79b1b4873b0
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 02:08:02 2014 -0500

    fix issue with shortcodes with no options

commit 912b8ee7d7a72687040c6b5c4fc4546211deb3eb
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 01:50:26 2014 -0500

    allow insertions

commit 058b68aa74be897a1d0209186a0c5c8716fcd655
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 01:39:00 2014 -0500

    some js fixes

commit 99bec41d6c5ccd0229110df9bdbf8633038378bb
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 19 00:37:17 2014 -0500

    bring up the new modal

commit abae15c6bb9ff57cc6231c639f24d00ccdb53507
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 18 12:59:11 2014 -0500

    fix the shit

commit cd939c621eddc4f23fd2c3b43b53319792511fde
Author: E.T.Cook <e@etc.io>
Date:   Mon Aug 18 12:49:45 2014 -0500

    changes

commit 9d4d85566db9ac5667fc6466bb11e4dd017038a0
Merge: e1e1cc1 e6854eb
Author: E.T.Cook <e@etc.io>
Date:   Mon Aug 18 12:40:48 2014 -0500

    Merge branch 'dev' of github.com:bearded-avenger/aesop-core

    Conflicts:
    	admin/assets/js/generator.min.js
    	admin/class-aesop-core-admin.php

commit e1e1cc186e5c708d2108f8eac8e14f4b2e84acf7
Author: E.T.Cook <e@etc.io>
Date:   Sun Aug 17 20:50:33 2014 -0500

    settings

commit 849da367f978f9fbd0642e26bfaf8f1e606b4e9b
Author: E.T.Cook <e@etc.io>
Date:   Sun Aug 17 20:00:12 2014 -0500

    objectify the shortcodes

commit f869557aea04a6601afe590f858f485d2c921151
Author: E.T.Cook <e@etc.io>
Date:   Sun Aug 17 19:45:42 2014 -0500

    getting the array

commit ada5467346eec78e14f78ac51851ab2e0d7d7467
Author: E.T.Cook <e@etc.io>
Date:   Sun Aug 17 18:20:30 2014 -0500

    scope the sections

commit e6854eb4da000a3180088a107ad1319b036fea4a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 16 08:20:42 2014 -0500

    gallery edit content fix + pretty error

commit 08a8e3c8cb14a8fb367ba73babcbc0384d3a50bd
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 16 08:10:26 2014 -0500

    fix merge

commit da46b2e250268da8a35e4b5e871061b1f117d759
Merge: 394c2cd 88f9093
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 16 08:08:23 2014 -0500

    Merge branch 'release/1.1' into dev

    Conflicts:
    	public/includes/components/component-heading.php

commit 88f909311405076eb2dee6ca36f2fe929e347495
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 16 07:55:34 2014 -0500

    improved chapter heading markup

commit 97ede5a864b4a8c8a285c563b0a7e482a7844e5f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 20:04:07 2014 -0500

    more gallery desc fix

commit 1723e30ad53867fc5309c19f5da4af46b0626641
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 20:01:37 2014 -0500

    clean up desc

commit ae76c0d52fe69a191d2106c3011d764e9d909620
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 19:58:21 2014 -0500

    rename add media to add gallery in gallery creation

commit 1f41996f047156685e64117cb803dd9236bbc41a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 19:39:37 2014 -0500

    more cleanup not needed items in gallery creation screen

commit 5703eda6b7eb5af94368b553d5a6a39d0040d9ac
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 19:35:54 2014 -0500

     cleanup gallery admin interface

commit 1ed9c99a8d4ad7638820b5a12e4d69250414332f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 16:17:37 2014 -0500

    automatically configure the offset distance for parallax floater

commit 8b53dedf8d481e4a5a65ba4e984919aca116b5e3
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 14:36:48 2014 -0500

    fix comments

commit bc0f933de62b14f0ea5763fb6e8a34ab7d80cd2c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 14:34:05 2014 -0500

    cache gallery retrieval

commit 074276584981db258a8c1f8f8b65fbe16259c4fc
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 13:24:03 2014 -0500

    Math.round to parallax transform y pos

commit 7c513265e8fe2902a0e0552438f4a26f5e25aa06
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 13:21:02 2014 -0500

    stray id

commit fcb4db39029541cf6330e67dd9d12ea0ea722a17
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 13:19:06 2014 -0500

    optimize parallax for quote component

    only animate if in view

commit c77fb6cce7ac10194c62de4b16b667124aa08408
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 13:06:17 2014 -0500

    filters for audio/video waypoints

    fixes #83

commit c178abd5a776629f02c15df6229f2ad5e95f5d71
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 12:59:25 2014 -0500

    floater position fixes

    fixes #84

commit 2cfbc595bfb9bb92a39e079e3eb448eb20136502
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 12:25:43 2014 -0500

    parallax + parallax floater optimizations

    don't run parallax if the component is not within view

commit 19d2ac93b628a5696541a6411c57b279661877f3
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 15 08:54:47 2014 -0500

    various generator field improvements

    new text area field, new text small field, new prefix to make sure correct info is entered

commit 7b8e96c44a12368beced41e4e0861fa3fb089f36
Author: E.T.Cook <e@etc.io>
Date:   Fri Aug 15 01:30:12 2014 -0500

    edit

commit 071f3964ba6c26cf625d341eca5fe5cce5a82c43
Author: E.T.Cook <e@etc.io>
Date:   Fri Aug 15 00:21:59 2014 -0500

    listener method for posterity

commit 0d5b4468ae98fbbd0969868b0c8d31c46ab7cad0
Author: E.T.Cook <e@etc.io>
Date:   Thu Aug 14 22:23:05 2014 -0500

    fix the visual and text states

commit 4caeb8e813c9b71b062c8b591a193278760acea1
Author: E.T.Cook <e@etc.io>
Date:   Thu Aug 14 19:55:44 2014 -0500

    allow html

commit dd6c4c1a52b2bb24d43cae597a755c4232bc97fd
Author: E.T.Cook <e@etc.io>
Date:   Thu Aug 14 19:18:22 2014 -0500

    content updates

commit 174382652d5e4facbcb427f312a65e928382603f
Author: E.T.Cook <e@etc.io>
Date:   Thu Aug 14 18:46:19 2014 -0500

    new handlers

commit 74e0c9b2b5a5d05e5f3eeafee1b9035b514e4b89
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Aug 14 18:09:34 2014 -0500

    clean up un-used vars

commit 4caa3d7ed53e31837cd4deb2b9886435ef06effe
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Aug 14 18:02:31 2014 -0500

    more gallery component refinements

commit 8d1b7c05132074551b3df90e505ab155eafa6ed6
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Thu Aug 14 14:48:08 2014 -0500

    optimized gallery retrieval

    get_post_gallery replaces BOTH the call to get_posts AND the regex needed to scrape the gallery for image ids. also include a warning if wrong gallery ID or no images found

commit 28fc3aa7a01cae0daacb4dacbbded9684cbed050
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 16:55:10 2014 -0500

    dont run genny markup where it's not supposed to be

commit 636ddc663f10bf92ef0661549dd7060c2a990b7c
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 15:38:14 2014 -0500

    tweak to colors

commit 5e3f07c1fd9d210c046b75501790d130e8ed0486
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 13:48:28 2014 -0500

    style tweaks to new UI

commit 95f5793b3064081afc52a199cc2a32c5dd1f660a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 13:36:15 2014 -0500

    modal close button

commit f261b1faacfc015149134ce9899f20984ade040f
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 11:45:43 2014 -0500

    ditch tooltips, go with small desc

commit a8de23f5e3a792153bdea5295abe370885862116
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 10:53:48 2014 -0500

    more new generator work

commit bb45b3ec4c2fc2d64536a8c0d11dd61dfc394925
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 10:12:20 2014 -0500

    keyup escape and styles

commit bd8dcee3a7e6ae41dc22e8c84b73f0cf884afc28
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 13 09:54:14 2014 -0500

    new ui

commit b16845282250321adde752464b9957a28bf3ea7f
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 13 01:27:12 2014 -0500

    try to control editability more

commit b9a907c0a76428d4c911ec1e2c29334fb33251bf
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 13 01:21:01 2014 -0500

    fix logic based on shortcode type

commit 6890476c9458e9e2d826d2aa4ffef603bd80d559
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 13 01:03:23 2014 -0500

    interface updates

commit 9767f23d895b73bce4d5dd30b42351b089a25647
Author: E.T.Cook <e@etc.io>
Date:   Wed Aug 13 00:33:32 2014 -0500

    fleshing it out

commit efe6f9178ca8d003132f01a9f698cf5aea1b6513
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 12 23:35:34 2014 -0500

    styles

commit 1ef3799e9c061e844d320a469cd02f594ddda53f
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 12 22:52:40 2014 -0500

    that was a bitch

commit ba2f6a5d6513e28d8d8bed62780048fb9da2d14c
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 12 15:54:05 2014 -0500

    code cleanup

commit c1745a1919055b52fc8c86fe604960f544d7a2a6
Author: E.T.Cook <e@etc.io>
Date:   Tue Aug 12 00:17:41 2014 -0500

    integration of mce plugin and views

commit 3607c8269f816d553ae1c916b0cfe9b1a9e13db4
Author: E.T.Cook <e@etc.io>
Date:   Mon Aug 11 22:47:35 2014 +0000

    update

commit 7cd1df29f969c37245ce2c2c3cbbab243fbf411a
Author: E.T.Cook <e@etc.io>
Date:   Mon Aug 11 21:09:23 2014 +0000

    composer.json

commit 394c2cd69ecf6ea5068c02cef15a96ec16b9011e
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 11 15:18:07 2014 -0500

    swap width/height

commit 662ebf160cf178b50558db77d7e089cf359f607d
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Mon Aug 11 15:13:40 2014 -0500

    images need height/width if lazy loading

commit 409eccbd3c9e296818cec78fe0e5db63a94d393b
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Fri Aug 8 10:14:37 2014 -0500

    updated translation files

commit b7abd284836852883d1df6477928b8ce32f5ab8a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Wed Aug 6 19:01:55 2014 -0500

    fix lazy on image component

commit 5a4288aa255ef3a6b8144f303b7456b6dae1a052
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Aug 5 17:52:04 2014 -0500

    map location filter

commit 3a5db2bd696ba1b5e62dbf6c6ec11e6019f81331
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Aug 5 17:51:07 2014 -0500

    chapter/timeline location filters

    filters to determine where chapter and timeline can be loaded. useful for using on pages.

commit a6944b0f124c7031b503d592f3fc4d8709d6f660
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Tue Aug 5 15:23:37 2014 -0500

    fixes for aesop lazy loader integration

commit 6e48134897f7eb54a11f7043f3ad314f52033e4a
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 2 13:40:57 2014 -0500

    lazy loader support chapter img bg

commit 1b1db5841d9db8c0beb02372f3ca23eb97c2ec77
Author: Bearded Avenger <email@nickhaskins.com>
Date:   Sat Aug 2 13:27:45 2014 -0500

    better support aesop lazy loader
fix failed merge
1.1
Merge branch 'master' into dev

Conflicts:
	admin/includes/notify.php
	composer.json
fix failed merge