Added assets to asset catalog
Make storyboard use assets from catalog
notification tracking now uses the unix epoch
changed time to a regular nsdate
Test that back to back queued notifications do not double-show
Merge branch 'master' into notif-tracking-timestamp
Merge branch 'master' into notif-tracking-timestamp
remove test that was non-deterministic. json key ordering different in iOS6 and iOS7 SDKs
Merge branch 'master' into notif-tracking-timestamp
bumped version number
use boundingRectWithSize on iOS7 where we can to avoid deprecation warning. (same as surveys)
iOS 7 Warning: Use -sizeThatFits: for label sizing
xcode 5.1 warning fixes
stop warnings in podspec when using MIN() macro
takeover notificaitons are automatically filtered from landscape-only apps
Merge remote-tracking branch 'origin/xcode-51-changes'
bumped version
bumped again
removed whitespace
Revert "xcode 5.1 warning fixes"

This reverts commit bdceb587857e3b6deaa7faee9a64f7288402f465.

This caused our Cocoapod to fail "pod spec lint". We will resolve
this further when @alex-hofsteede returns.