Formatting.
Merge branch 'master' of github.com:cappuccino/cappuccino
Fixed the bug about the dividerColor in a standardView
Fixed bug about the border of the dividerColor in a window
updated slices of aristo2
Change some pixel adjustements to reflect what IB is doing in nib2cib
Fixed bug with the dividerColor of a standardWindow in Aristo1
Adding missing key
Fixes #1716. Fixed: blurry popovers in Chrome.
Fixed: "cannot read property '_tokenScrollView' of null."

This error could occur when interacting with token fields.
Fixed: orphan token field autocomplete menus.

If the parent or grandparent window of a token field which was showing an autocomplete menu was closed, the menu would stick around even that the token field was gone.

This fix makes the token field autocomplete menu a proper child window which should also ensure it moves as needed if the parent window moves.
Fix for #224

This commit removes some of the more nonsensical main menu items in the capp NibApplication template.
Merge pull request #1700 from cacaodev/CPCollectionViewItem-loading

CPCollectionView -maxItemSize support, content binding, collection view item loading ... [+4]
Refs #1700. Clean up and use macros.
Refs #1700. Make `reloadContentCachingRemovedItems:` a private method.
Refs #1700. Use more macros.
Refs #1700. Fix unknown class or global warnings.
Refs #1700. Fixed: setItemPrototype crash.

Setting the item prototype without first adding the collection view to a view would cause a crash, as would reloadContent.

This fix makes sure the collection view doesn't try to tile itself unless it has a frame.
Merge pull request #1673 from mrcarlberg/handle_null_in_cp_description_of_object

Fixed error in CPDescriptionOfObject when JSON property has null value

Conflicts:
	Foundation/CPObject.j
Merge branch 'master' of github.mv.usa.alcatel.com:amercada/Cappuccino